From b3bd794b4f4b2d6dcc8f42e871a463facb8786da Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Tue, 20 Aug 2013 21:12:03 +0200
Subject: [vmchooser] Add support for dnbd3 (if servers are specified in
 config) Also add fallback if MAC address is not present in config

---
 .../data/opt/openslx/etc/vmware/run-virt.include      | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

(limited to 'remote/modules/vmplayer/data/opt/openslx')

diff --git a/remote/modules/vmplayer/data/opt/openslx/etc/vmware/run-virt.include b/remote/modules/vmplayer/data/opt/openslx/etc/vmware/run-virt.include
index 084828ff..b755133f 100755
--- a/remote/modules/vmplayer/data/opt/openslx/etc/vmware/run-virt.include
+++ b/remote/modules/vmplayer/data/opt/openslx/etc/vmware/run-virt.include
@@ -229,7 +229,7 @@ MemTrimRate = "-1"
 
 # ide-disks
 ide0:0.present = "$ide"
-ide0:0.fileName = "$diskfile"
+ide0:0.fileName = "$vm_diskfile"
 ## Edited for persistent mode.
 ide0:0.mode = "independent-${diskmode}"
 ##
@@ -245,7 +245,7 @@ ide1:1.deviceType = "cdrom-raw"
 # scsi-disks
 scsi0.present = "$scsi"
 scsi0:0.present = "$scsi"
-scsi0:0.fileName = "$diskfile"
+scsi0:0.fileName = "$vm_diskfile"
 scsi0.virtualDev = "$hddrv"
 ## Edited for persistent mode.
 scsi0:0.mode = "independent-${diskmode}"$stateFileConfiguration
@@ -270,7 +270,7 @@ $network_virtualDev
 ethernet0.connectionType = "$network_kind"
 #ethernet1.connectionType = "custom"
 #ethernet1.vnet = "/dev/vmnet2"
-ethernet0.address = "00:50:56:$VM_ID:$machostpart"
+ethernet0.address = "00:50:56:$macaddrsuffix"
 ethernet0.wakeOnPcktRcv = "FALSE"
 
 # sound
@@ -627,11 +627,14 @@ writelog ""
 ################################################################################
 
 # configure and start samba service to provide user's home directory
-if [ -f /usr/sbin/smbd ] ; then
-	sudo /opt/openslx/bin/sed -i /etc/vmware/smb.conf -e "s,USER,$USER,"
-	sudo /usr/sbin/nmbd -s /etc/vmware/smb.conf
-	sudo /usr/sbin/smbd -s /etc/vmware/smb.conf
-fi
+#if [ -f /usr/sbin/smbd ] ; then
+#	sudo /opt/openslx/bin/sed -i /etc/vmware/smb.conf -e "s,USER,$USER,"
+#	sudo /usr/sbin/nmbd -s /etc/vmware/smb.conf
+#	sudo /usr/sbin/smbd -s /etc/vmware/smb.conf
+#fi
+
+# For debugging
+cp "$conffile" "/tmp/vmware-last-config"
 
 # using the modified version of the wrapper script
 VIRTCMD="/opt/openslx/bin/vmplayer"
-- 
cgit v1.2.3-55-g7522