vbox changes for vmchooser and var adaption

1 files changed, 6 insertions, 5 deletions

diff --git a/os-plugins/plugins/vmware/files/run-virt.include b/os-plugins/plugins/vmware/files/run-virt.include
index 714fee36..9472d87f 100644
--- a/os-plugins/plugins/vmware/files/run-virt.include
+++ b/os-plugins/plugins/vmware/files/run-virt.include
@@ -121,7 +121,7 @@ ${network_virtualDev}
 ethernet0.connectionType = \"${network_kind}\"
 #ethernet1.connectionType = \"custom\"
 #ethernet1.vnet = \"/dev/vmnet2\"
-ethernet0.address = \"00:50:56:0D:${mac}\"
+ethernet0.address = \"00:50:56:${VM_ID}:${machostpart}\"
 ethernet0.wakeOnPcktRcv = \"FALSE\"
 
 # sound
@@ -224,12 +224,16 @@ pref.eula.1.buildNumber = \"${vmbuild}\"" >${vmhome}/preferences
 # declaration of default variables
 ################################################################################
 
+# VM-ID static (0D), remove if changed to 00
+VM_ID="0D"
 # temporary disk space for logs, etc...
 redodir=/tmp/vmware/${USER}
 # dir for configs and vmem file
 confdir=${redodir}
 # configfile
 conffile="${confdir}/run-vmware.conf"
+# diskfile
+diskfile=${vmpath}
 # users vmware config folder
 vmhome="${HOME}/.vmware"
 # logfile
@@ -255,9 +259,6 @@ else
   network_virtualDev='# using default virtualDev for ethernet0'
 fi
 
-# enable 3D
-enable3d=$(grep -i "<enable3d param=.*" ${xml} 2>/dev/null | \
-  awk -F '=' {'print $2'})
 case "$enable3d" in
   *true*|*TRUE*|*yes*|*YES*)
     enable3d="TRUE"
@@ -419,7 +420,7 @@ writelog "\t/tmp info: \
      $(grep "/tmp " /proc/mounts) $(df -h | grep " /tmp$" | awk '{print $2}')"
 # hw setup
 writelog "Hardware:"
-writelog "\tMAC:\t\t00:50:56:0D:${mac}"
+writelog "\tMAC:\t\t00:50:56:${VM_ID}:${machostpart}"
 if [ -n "${network_card}" ]; then
   writelog "\tNet Adaptor:\t${network_card}"
 fi