<virtualization> More path changes... Might not be complete yet

1 files changed, 28 insertions, 28 deletions

diff --git a/remote/modules/vmchooser/data/opt/openslx/scripts/systemd-vmchooser_env b/remote/modules/vmchooser/data/opt/openslx/scripts/systemd-vmchooser_env
index 4119ad9c..167f1a96 100755
--- a/remote/modules/vmchooser/data/opt/openslx/scripts/systemd-vmchooser_env
+++ b/remote/modules/vmchooser/data/opt/openslx/scripts/systemd-vmchooser_env
@@ -11,23 +11,23 @@ hwinfo --cdrom | grep -i "Device File:" | awk {'print $3'} >/etc/openslx/hwinfo.
 hwinfo --floppy | grep -i "Device File:" | awk {'print $3'} >/etc/openslx/hwinfo.floppy 
 
 #from plugins/vmchooser/XX_vmchooser.sh
-VMCHOOSER_CONF_DIR=/opt/openslx/etc/vmchooser
+VMCHOOSER_DIR="/opt/openslx/vmchooser"
+VMCHOOSER_CONF_DIR="$VMCHOOSER_DIR/config"
 
-mkdir -p ${VMCHOOSER_CONF_DIR}/loopimg
-mkdir -p ${VMCHOOSER_CONF_DIR}/fd-loop -m 1777
+mkdir -p "${VMCHOOSER_DIR}/data/loopimg"
+mkdir -p "${VMCHOOSER_DIR}/fd-loop" -m 1777
 
 # mount a clean tempfs (bug in UnionFS prevents loopmount to work)
 grep -qE "unionfs |aufs " /proc/mounts && \
-mount -n -o size=1500k -t tmpfs vm-loopimg ${VMCHOOSER_CONF_DIR}/loopimg
+	mount -n -o size=1500k -t tmpfs vm-loopimg "${VMCHOOSER_DIR}/data/loopimg"
 
 # create an empty floppy image of 1.4MByte size
-dd if=/dev/zero of=${VMCHOOSER_CONF_DIR}/loopimg/fd.img count=2880 bs=512 2>/dev/null
-chmod 0777 ${VMCHOOSER_CONF_DIR}/loopimg/fd.img
+dd "if=/dev/zero" "of=${VMCHOOSER_DIR}/data/loopimg/fd.img" count=2880 bs=512 2>/dev/null
+chmod 0777 "${VMCHOOSER_DIR}/data/loopimg/fd.img"
 
 # use dos formatter copied into stage3
-mkdosfs ${VMCHOOSER_CONF_DIR}/loopimg/fd.img >/dev/null 2>&1 #|| error
-mount -n -t msdos -o loop,umask=000 ${VMCHOOSER_CONF_DIR}/loopimg/fd.img \
-      ${VMCHOOSER_CONF_DIR}/fd-loop
+mkdosfs "${VMCHOOSER_DIR}/data/loopimg/fd.img"
+mount -n -t msdos -o loop,umask=000 "${VMCHOOSER_DIR}/data/loopimg/fd.img" "${VMCHOOSER_DIR}/fd-loop"
 
 #pvs integration    
 #if [ $vmchooser_pvs -ne 0 ]; then
@@ -58,7 +58,7 @@ mkdir -p /var/log/samba
 
 #from plugins/vmchooser/80-after-plugins/virtualization.sh
 
-# change free mem
+# estimate free mem
 mem_free=$(grep -i "^memfree:" /proc/meminfo | awk '{print $2}')
 mem_cached=$(grep -i "^cached:" /proc/meminfo | awk '{print $2}')
 mem_swapcached=$(grep -i "^swapcached:" /proc/meminfo | awk '{print $2}')
@@ -66,51 +66,51 @@ mem_swapcached=$(grep -i "^swapcached:" /proc/meminfo | awk '{print $2}')
 [ -z "$mem_cached" ] && mem_cached="0"
 [ -z "$mem_swapcached" ] && mem_swapcached="0"
 totalmem="$[ ( $mem_free + $mem_cached + $mem_swapcached ) / 1024 ]"
-echo "totalmem=${totalmem}" >> ${VMCHOOSER_CONF_DIR}/virtualization.conf
+echo "totalmem=${totalmem}" >> "${VMCHOOSER_CONF_DIR}/virtualization.conf"
 
-# cpu cores
+# determine number of cpu cores
 CPU_CORES=$(grep '^processor.*:' /proc/cpuinfo | wc -l)
 if [ "${CPU_CORES}" -gt "1" 2>/dev/null ]; then
-  echo "cpu_cores=${CPU_CORES}" >> ${VMCHOOSER_CONF_DIR}/virtualization.conf
+  echo "cpu_cores=${CPU_CORES}" >> "${VMCHOOSER_CONF_DIR}/virtualization.conf"
 else
-  echo 'cpu_cores=1' >> ${VMCHOOSER_CONF_DIR}/virtualization.conf
+  echo 'cpu_cores=1' >> "${VMCHOOSER_CONF_DIR}/virtualization.conf"
 fi
 
 # arch
-echo "host_arch=$(uname -m)" >> ${VMCHOOSER_CONF_DIR}/virtualization.conf
+echo "host_arch=$(uname -m)" >> "${VMCHOOSER_CONF_DIR}/virtualization.conf"
 
 # VT enabled cpu?
-if grep -q ^flags.*\\\<vmx\\\> /proc/cpuinfo; then
-    echo "vtflag=1" >> ${VMCHOOSER_CONF_DIR}/virtualization.conf
-    echo 'kvm_module="kvm_intel"' >> ${VMCHOOSER_CONF_DIR}/virtualization.conf
-  elif grep -q ^flags.*\\\<svm\\\> /proc/cpuinfo; then
-    echo "vtflag=1" >> ${VMCHOOSER_CONF_DIR}/virtualization.conf
-    echo 'kvm_module="kvm_amd"' >> ${VMCHOOSER_CONF_DIR}/virtualization.conf
+if grep -q '^flags.*\<vmx\>' "/proc/cpuinfo"; then
+    echo "vtflag=1" >> "${VMCHOOSER_CONF_DIR}/virtualization.conf"
+    echo 'kvm_module="kvm_intel"' >> "${VMCHOOSER_CONF_DIR}/virtualization.conf"
+  elif grep -q '^flags.*\<svm\>' "/proc/cpuinfo"; then
+    echo "vtflag=1" >> "${VMCHOOSER_CONF_DIR}/virtualization.conf"
+    echo 'kvm_module="kvm_amd"' >> "${VMCHOOSER_CONF_DIR}/virtualization.conf"
   else
-    echo "vtflag=0" >> ${VMCHOOSER_CONF_DIR}/virtualization.conf
+    echo "vtflag=0" >> "${VMCHOOSER_CONF_DIR}/virtualization.conf"
 fi
 
 # write mac
 if [ -n "$SLX_PXE_MAC" ]; then
-	echo "hostmacaddr=${SLX_PXE_MAC}" >> ${VMCHOOSER_CONF_DIR}/virtualization.conf
+	echo "hostmacaddr=${SLX_PXE_MAC}" >> "${VMCHOOSER_CONF_DIR}/virtualization.conf"
 else ## Fallback:
-	echo "hostmacaddr=$(ip a | grep ether | grep -o -E -i '([0-9a-f]{2}:){5}[0-9a-f]{2}' | head -n 1)" >> ${VMCHOOSER_CONF_DIR}/virtualization.conf
+	echo "hostmacaddr=$(ip a | grep ether | grep -o -E -i '([0-9a-f]{2}:){5}[0-9a-f]{2}' | head -n 1)" >> "${VMCHOOSER_CONF_DIR}/virtualization.conf"
 fi
 # ip addr
-echo "hostip=${SLX_PXE_CLIENT_IP}" >> ${VMCHOOSER_CONF_DIR}/virtualization.conf
+echo "hostip=${SLX_PXE_CLIENT_IP}" >> "${VMCHOOSER_CONF_DIR}/virtualization.conf"
 # hostname
-echo "hostname=${SLX_HOSTNAME}" >> ${VMCHOOSER_CONF_DIR}/virtualization.conf
+echo "hostname=${SLX_HOSTNAME}" >> "${VMCHOOSER_CONF_DIR}/virtualization.conf"
 
 # get further hw information
 j=0
 for i in $(cat /etc/openslx/hwinfo.cdrom); do
-    echo "cdrom_$j=$i" >> ${VMCHOOSER_CONF_DIR}/virtualization.conf
+    echo "cdrom_$j=$i" >> "${VMCHOOSER_CONF_DIR}/virtualization.conf"
     j=$(expr $j + 1)
 done
 
 j=0
 for i in $(cat /etc/openslx/hwinfo.floppy); do
-    echo "floppy_$j=$i" >> ${VMCHOOSER_CONF_DIR}/virtualization.conf
+    echo "floppy_$j=$i" >> "${VMCHOOSER_CONF_DIR}/virtualization.conf"
     j=$(expr $j + 1)
 done