From 1b2757225577f8ed98af794856532913918cd93c Mon Sep 17 00:00:00 2001
From: Dirk
Date: Tue, 27 Nov 2012 22:55:24 +0100
Subject: Some more small Vbox, ... fixes for samba stuff.

---
 src/os-plugins/plugins/vmware/XX_vmware.sh           | 2 +-
 src/os-plugins/plugins/vmware/files/run-virt.include | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/os-plugins/plugins/vmware')

diff --git a/src/os-plugins/plugins/vmware/XX_vmware.sh b/src/os-plugins/plugins/vmware/XX_vmware.sh
index eee8b17f..f7fe3948 100644
--- a/src/os-plugins/plugins/vmware/XX_vmware.sh
+++ b/src/os-plugins/plugins/vmware/XX_vmware.sh
@@ -78,7 +78,7 @@ stage3 setup" > ${PLUGINCONFDIR}/vmware.conf
       # setting the base samba configuration if available
       [ -f /mnt/opt/openslx/plugins/vmchooser/smb.conf -a -f /mnt/usr/sbin/smbd ] && \
         sed -e "s,NWIF,$vmsub,;s,PIDDIR,/var/run/vmware," \
-          /mnt/opt/openslx/plugins/virtualization/smb.conf \
+          /mnt/opt/openslx/plugins/vmchooser/smb.conf \
           >/etc/vmware/smb.conf
     fi
 
diff --git a/src/os-plugins/plugins/vmware/files/run-virt.include b/src/os-plugins/plugins/vmware/files/run-virt.include
index d38e5dff..621f31db 100644
--- a/src/os-plugins/plugins/vmware/files/run-virt.include
+++ b/src/os-plugins/plugins/vmware/files/run-virt.include
@@ -506,8 +506,8 @@ writelog ""
 # configure and start samba service to provide user's home directory
 if [ -f /usr/sbin/smbd ] ; then
   sudo /opt/openslx/rootfs/bin/sed -i /etc/vmware/smb.conf -e "s,$USER,USER,"
-  sudo /usr/sbin/nmbd -c /etc/vmware/smb.conf
-  sudo /usr/sbin/smbd -c /etc/vmware/smb.conf
+  sudo /usr/sbin/nmbd -s /etc/vmware/smb.conf
+  sudo /usr/sbin/smbd -s /etc/vmware/smb.conf
 fi
 
 # using the modified version of the wrapper script
-- 
cgit v1.2.3-55-g7522