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/virtualbox/XX_virtualbox.sh       | 2 +-
 src/os-plugins/plugins/virtualbox/files/run-virt.include | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

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

diff --git a/src/os-plugins/plugins/virtualbox/XX_virtualbox.sh b/src/os-plugins/plugins/virtualbox/XX_virtualbox.sh
index adacc556..46422701 100644
--- a/src/os-plugins/plugins/virtualbox/XX_virtualbox.sh
+++ b/src/os-plugins/plugins/virtualbox/XX_virtualbox.sh
@@ -92,7 +92,7 @@ if [ -e ${CONFFILE} ]; then
     # setting the base samba configuration
     [ -f /mnt/opt/openslx/plugins/vmchooser/smb.conf -a -f /mnt/usr/sbin/smbd ] && \
       sed -e "s,NWIF,vboxnet0,;s,PIDDIR,/var/run/vbox," \
-        /mnt/opt/openslx/plugins/virtualization/smb.conf \
+        /mnt/opt/openslx/plugins/vmchooser/smb.conf \
         >/mnt/etc/vbox/smb.conf
 
     # finished ...
diff --git a/src/os-plugins/plugins/virtualbox/files/run-virt.include b/src/os-plugins/plugins/virtualbox/files/run-virt.include
index 48f95f22..694b65fe 100644
--- a/src/os-plugins/plugins/virtualbox/files/run-virt.include
+++ b/src/os-plugins/plugins/virtualbox/files/run-virt.include
@@ -411,8 +411,8 @@ fi
 # 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/vbox/smb.conf -e "s,$USER,USER,"
-  sudo /usr/sbin/nmbd -c /etc/vbox/smb.conf
-  sudo /usr/sbin/smbd -c /etc/vbox/smb.conf
+  sudo /usr/sbin/nmbd -s /etc/vbox/smb.conf
+  sudo /usr/sbin/smbd -s /etc/vbox/smb.conf
 fi
 
 # wait for a certain command to settle
-- 
cgit v1.2.3-55-g7522