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

9 files changed, 74 insertions, 110 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
 
diff --git a/remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-run_virt b/remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-run_virt
index a5bb735d..5c85dfcd 100755
--- a/remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-run_virt
+++ b/remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-run_virt
@@ -22,12 +22,15 @@
 ### Define default dirs / get configs
 ################################################################################
 
+VMCHOOSER_DIR="/opt/openslx/vmchooser"
+VMCHOOSER_CONF_DIR="$VMCHOOSER_DIR/config"
+
 # include general configuration from vmchooser
-[ -f /opt/openslx/etc/vmchooser/vmchooser.conf ] && . /opt/openslx/etc/vmchooser/vmchooser.conf
+[ -f "$VMCHOOSER_CONF_DIR/vmchooser.conf" ] && . "$VMCHOOSER_CONF_DIR/vmchooser.conf"
 # load general virtualization information
-[ -f /opt/openslx/etc/vmchooser/virtualization.conf ] && . /opt/openslx/etc/vmchooser/virtualization.conf
+[ -f "$VMCHOOSER_CONF_DIR/virtualization.conf" ] && . "$VMCHOOSER_CONF_DIR/virtualization.conf"
 # Load general openslx config
-[ -f /opt/openslx/config ] && . /opt/openslx/config
+[ -f "/opt/openslx/config" ] && . "/opt/openslx/config"
 
 ################################################################################
 ### Functions used throughout the script
@@ -39,7 +42,7 @@ writelog () {
 	# write to stdout
 	echo -e "$1"
 	# log into file
-	echo -e "$1" >> ${LOGFILE}
+	echo -e "$1" >> "${LOGFILE}"
 }
 
 # Clean exit will be called at the end of this script
@@ -380,7 +383,7 @@ fdtest=${floppy_0:+"TRUE"}
 # if $fdtest not set floppy0="FALSE", else "TRUE"
 floppy0=${fdtest:-"FALSE"}
 floppy1="TRUE"
-floppy1name="/opt/openslx/etc/vmchooser/loopimg/fd.img"
+floppy1name="$VMCHOOSER_DIR/data/loopimg/fd.img"
 # if $cdrom_0 from run-virt.include set then cdtest="TRUE"
 cdtest=
 cdtest=${cdrom_0:+"TRUE"}
@@ -455,11 +458,11 @@ PID_LPD="$!"
 
 # Copy guest configuration (with added information) config.xml to be accessed
 # via virtual floppy
-cp "$xmlfile" "/opt/openslx/etc/vmchooser/fd-loop/config.xml"
+cp "$xmlfile" "$VMCHOOSER_DIR/fd-loop/config.xml"
 # Add another file with resolution information
-xrandr | grep -o -E 'current\s*[0-9]+\s*x\s*[0-9]+' | cut -c 8- | sed -r 's/(\s|\t|\n)//g' | head -n 1 > "/opt/openslx/etc/vmchooser/fd-loop/hostres.txt"
+xrandr | grep -o -E 'current\s*[0-9]+\s*x\s*[0-9]+' | cut -c 8- | sed -r 's/(\s|\t|\n)//g' | head -n 1 > "$VMCHOOSER_DIR/fd-loop/hostres.txt"
 # Add our magic openslx binary that sets the correct guest resolution
-cp "/opt/openslx/etc/vmchooser/openslx.exe" "/opt/openslx/etc/vmchooser/fd-loop/"
+cp "$VMCHOOSER_DIR/data/openslx.exe" "$VMCHOOSER_DIR/fd-loop/"
 
 # Try to use dnbd3 to access the image
 unset vm_diskfile
@@ -503,13 +506,13 @@ fi
 writelog "Used diskfile: $vm_diskfile"
 
 # Get all virtual machine specific stuff from the respective include file
-if [ ! -e "/opt/openslx/etc/${xmlvirt}/run-virt.include" ] ; then
+if [ ! -e "$VMCHOOSER_DIR/$xmlvirt/run-virt.include" ] ; then
 	writelog "Failed because of missing ${xmlvirt} plugin."
 	cleanexit 1
 fi
 
 self="${xmlvirt}"
-. "/opt/openslx/etc/${xmlvirt}/run-virt.include" || writelog "Erroneous run-virt.include for $xmlvirt"
+. "$VMCHOOSER_DIR/$xmlvirt/run-virt.include" || writelog "Erroneous run-virt.include for $xmlvirt"
 # start a windowmanager for easier handling
 # (expect problems w/ windows opening in background w/ vmware without wm)
 for dm in openbox kwin xfwm4 metacity blackbox twm fvwm2 ; do
diff --git a/remote/modules/vmchooser/data/opt/openslx/vmchooser/data/openslx.exe b/remote/modules/vmchooser/data/opt/openslx/vmchooser/data/openslx.exe
index e016f407..13092874 100755
--- a/remote/modules/vmchooser/data/opt/openslx/vmchooser/data/openslx.exe
+++ b/remote/modules/vmchooser/data/opt/openslx/vmchooser/data/openslx.exe
diff --git a/remote/modules/vmware/data/opt/openslx/bin/vmplayer b/remote/modules/vmware/data/opt/openslx/bin/vmplayer
index 147f514f..0f7d9232 100755
--- a/remote/modules/vmware/data/opt/openslx/bin/vmplayer
+++ b/remote/modules/vmware/data/opt/openslx/bin/vmplayer
@@ -5,10 +5,12 @@ PREFIX=/usr/lib/vmware # depends on the vmware location
 # HACK: Let the OpenGL driver report s3tc capability even if not present, so 3D will be enabled
 export force_s3tc_enable=true
 
-exec "$PREFIX"'/lib/wrapper-gtk24.sh' \
-     "$PREFIX"'/lib' \
-     "$PREFIX"'/bin/vmplayer' \
-     "$PREFIX"'/libconf' "$@"
+PROG=$(basename $0)
+
+exec "$PREFIX/lib/wrapper-gtk24.sh" \
+     "$PREFIX/lib" \
+     "$PREFIX/bin/$PROG" \
+     "$PREFIX/libconf" "$@"
 
 
 
diff --git a/remote/modules/vmware/data/opt/openslx/bin/vmware b/remote/modules/vmware/data/opt/openslx/bin/vmware
index 1fe9b11d..aa0b74b1 100755..120000
--- a/remote/modules/vmware/data/opt/openslx/bin/vmware
+++ b/remote/modules/vmware/data/opt/openslx/bin/vmware
@@ -1,11 +1 @@
-#!/bin/sh
-# radically simplified version of the original script vmplayer by VMware Inc.
-PREFIX=/usr/lib/vmware # depends on the vmware location
-exec "$PREFIX"'/lib/wrapper-gtk24.sh' \
-     "$PREFIX"'/lib' \
-     "$PREFIX"'/bin/vmware' \
-     "$PREFIX"'/libconf' "$@"
-
-
-
-
+vmplayer
\ No newline at end of file
diff --git a/remote/modules/vmware/data/opt/openslx/scripts/systemd-vmware_env b/remote/modules/vmware/data/opt/openslx/scripts/systemd-vmware_env
index bf7bfc5e..2112b2d7 100755
--- a/remote/modules/vmware/data/opt/openslx/scripts/systemd-vmware_env
+++ b/remote/modules/vmware/data/opt/openslx/scripts/systemd-vmware_env
@@ -10,18 +10,19 @@
 # General information about OpenSLX can be found at http://openslx.org/ 
 # -----------------------------------------------------------------------------
 
-VMWARE_CONF_DIR=/opt/openslx/etc/vmware
+VMWARE_CONF_DIR=/opt/openslx/vmchooser/vmware
+VMCHOOSER_CONF_DIR=/opt/openslx/vmchooser/config
 
 for wait in 1 1 2 2 3 end; do
-	grep '^SLX_DNS' /opt/openslx/config > /dev/null && break
+	grep '^SLX_DNS' "/opt/openslx/config" > /dev/null && break
 	[ "$wait" == "end" ] && echo "No DNS config found, using google dns" && break
 	echo "Waiting for DNS config.."
 	sleep "$wait"
 done
 
 #source config file
-. /opt/openslx/config
-. ${VMWARE_CONF_DIR}/vmware.conf
+. "/opt/openslx/config"
+. "${VMWARE_CONF_DIR}/vmware.conf"
 
 vm_dhcpd() {
 
@@ -32,7 +33,7 @@ vm_dhcpd() {
    [ -n "${wpad}" ] && wpad_config="option  wpad    ${wpad}"
 
    # configuring dhcpd stub for virtual networks
-cat > ${VMWARE_CONF_DIR}/udhcpd.conf << EOF
+cat > "${VMWARE_CONF_DIR}/udhcpd.conf" << EOF
 # general udhcpd configuration file for virtual machines written by $0
 
 # start and end of the IP lease block
@@ -77,34 +78,32 @@ EOF
 setup_network() {
 	#from plugins/vmware/XX_vmware.sh
 
-	mkdir -p /tmp/virt/vmware -m 1777
-	mkdir -p /dev/shm/vmware -m 1777
-	mkdir -p /var/run/vmware -m 1777
-	mkdir -p /etc/vmware/udhcpd    
+	mkdir -p "/tmp/virt/vmware" -m 1777
+	mkdir -p "/dev/shm/vmware" -m 1777
+	mkdir -p "/var/run/vmware" -m 1777
+	mkdir -p "/etc/vmware/udhcpd"    
 
 	# variable might contain ",NAT" which is to be taken off
 	if [ -n "$vmnet1" ] ; then
-	      local vmip=${vmnet1%/*} # x.x.x.x/yy => 'x.x.x.x'">
+	      local vmip="${vmnet1%/*}" # x.x.x.x/yy => 'x.x.x.x'">
 	      local vmsub=$(echo $vmip |sed 's,\(.*\)\..*,\1,') # x.x.x.x => x.x.x
 	      # setting up the udhcpd configuration
 	      sed -e "s,NWIF,vmnet1,;s,/misc/,/vmware/," \
-		  -e "s,CNETWORK,$vmsub,;s,PIDFILE,/var/run/vmware/udhcpd-vmnet1.pid," \
-		  -e "s,LEASEFILE,/var/run/vmware/udhcpd-vmnet1.leases," \
-	      ${VMWARE_CONF_DIR}/udhcpd.conf >/etc/vmware/udhcpd/udhcpd-vmnet1.conf
+			  -e "s,CNETWORK,$vmsub,;s,PIDFILE,/var/run/vmware/udhcpd-vmnet1.pid," \
+			  -e "s,LEASEFILE,/var/run/vmware/udhcpd-vmnet1.leases," \
+		      "${VMWARE_CONF_DIR}/udhcpd.conf" > "/etc/vmware/udhcpd/udhcpd-vmnet1.conf"
 	      # setting the base samba configuration if available
-	      if [ -f /etc/openslx/vmchooser/smb.conf \
-		-a -f /usr/sbin/smbd ] ; then
-		  sed -e "s#NWIF#vmnet1,vmnet8#;s,PIDDIR,/var/run/vmware," \
-		    ${VMCHOOSER_CONF_DIR}/smb.conf \
-		    >/etc/vmware/smb.conf
+	      if [ -f "$VMCHOOSER_CONF_DIR/smb.conf" -a -f "/usr/sbin/smbd" ] ; then
+				sed -e "s#NWIF#vmnet1,vmnet8#;s,PIDDIR,/var/run/vmware," \
+					"${VMCHOOSER_CONF_DIR}/smb.conf" > "/etc/vmware/smb.conf"
 	      fi
 	fi
 
 	# vmware nat interface configuration
 	if [ -n "$vmnet8" ] ; then
-	      local vmnet8ip=${vmnet8%/*}
-	      local vmpx=${vmnet8#*/}
-	      local vmsub=$(echo $vmnet8ip |sed 's,\(.*\)\..*,\1,') # x.x.x.x => x.x.x">
+	      local vmnet8ip="${vmnet8%/*}"
+	      local vmpx="${vmnet8#*/}"
+	      local vmsub=$(echo "$vmnet8ip" | sed 's,\(.*\)\..*,\1,') # x.x.x.x => x.x.x">
 	      # vmip is user for vmnet8 device
 	      # vmnet is user for config files nat.conf/dhcp
 	      local vmip="${vmsub}.1"
@@ -139,47 +138,19 @@ setup_network() {
 	############################################################################
 	# vmware stuff second part: setting up the environment
 	# make udhcpd more silent
-	touch /var/run/vmware/udhcpd-vmnet1.leases \
-	      /var/run/vmware/udhcpd-vmnet8.leases
+	touch "/var/run/vmware/udhcpd-vmnet1.leases" \
+	      "/var/run/vmware/udhcpd-vmnet8.leases"
 
 	# create the needed devices which effects all vmware options
 	# they are not created automatically via module load
 	for i in "/dev/vmnet0 c 119 0" "/dev/vmnet1 c 119 1" \
 		 "/dev/vmnet8 c 119 8" "/dev/vmmon c 10 165"; do
-		 mknod $i
+		 mknod "$i"
 	done
 
 	chmod 0700 /dev/vmnet*
 }
 
-adapt_tmpfs() {
-	# from plugins/vmware/init-hooks/80-after-plugins/adapt-tmpfs.sh
-	# Init hook to adapt the tmpfs size for VMware/Player
-	# (should be kept identical to the files of virtualbox plugin)
-	#############################################################################
-
-	# adapt tmpfs size (overbook)
-	case $(grep tmpfs /proc/mounts) in
-	  */tmp*)
-	    mount -o remount,size=175% /tmp
-	   ;;
-	  */uniontmp*)
-	    mount -o remount,size=175% /uniontmp
-	    ;;
-	esac
-}
-
-#from /etc/init.d/vmware-env
-
-#functions: helper functions
-tempdir () { 
-   # Create a special tempfs directory
-   mkdir -m 1777 -p /tmp/vmware
-   # Don't mount special tempfs, when using local harddrive for /tmp
-   [ ! -n "$(cat /proc/mounts |grep ' /tmp '|grep '/dev/sd')" ] \
-   && mount -t tmpfs -o size=180%,mode=1777 tmpfs /tmp/vmware
-}
-
 load_modules () { 
    # VMplayer common stuff
    insmod /lib/modules/vmware/vmmon.ko 
@@ -242,11 +213,9 @@ case "$1" in
     #start: defines start function for initscript
     vm_dhcpd
     setup_network
-#   adapt_tmpfs 
     # hack to access the first serial/parallel port
     chmod a+rw /dev/ttyS0
     chmod a+rw /dev/parport0
-    tempdir
     load_modules
     vmnetif
     vmblock
diff --git a/remote/modules/vmware/data/opt/openslx/etc/vmware/nvram b/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/nvram
index 85125f1e..85125f1e 100644
--- a/remote/modules/vmware/data/opt/openslx/etc/vmware/nvram
+++ b/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/nvram
diff --git a/remote/modules/vmware/data/opt/openslx/etc/vmware/run-virt.include b/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/run-virt.include
index e60d5a5b..2e7aeaf5 100755..100644
--- a/remote/modules/vmware/data/opt/openslx/etc/vmware/run-virt.include
+++ b/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/run-virt.include
@@ -329,7 +329,7 @@ $paraldev
 HEREEND
 	
 	# set the appropriate permissions for the vmware config file
-	chmod u+rwx ${conffile} >/dev/null 2>&1
+	chmod u+rwx "${conffile}" >/dev/null 2>&1
 }
 
 preferencesheader ()
@@ -431,7 +431,7 @@ diskfile="${vmpath}"
 vmhome="${HOME}/.vmware"
 
 # get several version infos for vmware/player
-. /opt/openslx/etc/vmware/vmware.conf
+. /opt/openslx/vmchooser/vmware/vmware.conf
 vmbuild=$buildversion
 vmversion=$version
 
@@ -569,7 +569,7 @@ sync
 # own nvram. We need it for floppy drive b, default nvram has just drive a
 # TODO: optimize, currently kinda inefficient, too much copys, but we
 # don't know which one is installed...
-cp "/opt/openslx/etc/vmware/nvram" "$confdir/nvram" 2>/dev/null
+cp "/opt/openslx/vmchooser/vmware/nvram" "$confdir/nvram" 2>/dev/null
 
 
 # logging and stdout
diff --git a/remote/modules/vmware/data/opt/openslx/etc/vmware/vmware.conf b/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/vmware.conf
index 210b814f..210b814f 100644
--- a/remote/modules/vmware/data/opt/openslx/etc/vmware/vmware.conf
+++ b/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/vmware.conf