From 45a1b48a1cee85ec2c7ca58f40d47253d3e5649c Mon Sep 17 00:00:00 2001
From: Dirk
Date: Tue, 27 Nov 2012 23:01:31 +0100
Subject: Changing smb configuration file path (VBox & Co.)

---
 src/os-plugins/plugins/qemukvm/XX_qemukvm.sh       | 6 +++---
 src/os-plugins/plugins/virtualbox/XX_virtualbox.sh | 4 ++--
 src/os-plugins/plugins/vmware/XX_vmware.sh         | 9 +++++----
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/os-plugins/plugins/qemukvm/XX_qemukvm.sh b/src/os-plugins/plugins/qemukvm/XX_qemukvm.sh
index a7cf6b64..b0d40683 100644
--- a/src/os-plugins/plugins/qemukvm/XX_qemukvm.sh
+++ b/src/os-plugins/plugins/qemukvm/XX_qemukvm.sh
@@ -109,11 +109,11 @@ ALL ALL=NOPASSWD: /sbin/iptables -t nat -? POSTROUTING -s 192.168.1*.0/24 -o br0
 EOF
 
     # setting the base samba configuration
-    if [ -f /mnt/opt/openslx/plugins/vmchooser/smb.conf -a \
+    if [ -f /mnt/opt/openslx/plugin-repo/vmchooser/smb.conf -a \
       -f /mnt/usr/sbin/smbd ] ; then 
       testmkd /mnt/etc/qemu
-      sed -e "s#NWIF#tapnat0#taphost0#;s#PIDDIR#/tmp/virt#" \
-        /mnt/opt/openslx/plugins/vmchooser/smb.conf \
+      sed -e "s#NWIF#192.168.101.254,192.168.102.254#;s#PIDDIR#/tmp/virt#" \
+        /mnt/opt/openslx/plugin-repo/vmchooser/smb.conf \
         >/mnt/etc/qemu/smb.conf
     fi
   fi
diff --git a/src/os-plugins/plugins/virtualbox/XX_virtualbox.sh b/src/os-plugins/plugins/virtualbox/XX_virtualbox.sh
index 46422701..37e1caa6 100644
--- a/src/os-plugins/plugins/virtualbox/XX_virtualbox.sh
+++ b/src/os-plugins/plugins/virtualbox/XX_virtualbox.sh
@@ -90,9 +90,9 @@ if [ -e ${CONFFILE} ]; then
     chown root:vboxusers /dev/vboxdrv
 
     # setting the base samba configuration
-    [ -f /mnt/opt/openslx/plugins/vmchooser/smb.conf -a -f /mnt/usr/sbin/smbd ] && \
+    [ -f /mnt/opt/openslx/plugin-repo/vmchooser/smb.conf -a -f /mnt/usr/sbin/smbd ] && \
       sed -e "s,NWIF,vboxnet0,;s,PIDDIR,/var/run/vbox," \
-        /mnt/opt/openslx/plugins/vmchooser/smb.conf \
+        /mnt/opt/openslx/plugin-repo/vmchooser/smb.conf \
         >/mnt/etc/vbox/smb.conf
 
     # finished ...
diff --git a/src/os-plugins/plugins/vmware/XX_vmware.sh b/src/os-plugins/plugins/vmware/XX_vmware.sh
index f7fe3948..2b51936d 100644
--- a/src/os-plugins/plugins/vmware/XX_vmware.sh
+++ b/src/os-plugins/plugins/vmware/XX_vmware.sh
@@ -76,10 +76,11 @@ stage3 setup" > ${PLUGINCONFDIR}/vmware.conf
           -e "s,LEASEFILE,/var/run/vmware/udhcpd-vmnet1.leases," \
       /mnt/etc/opt/openslx/udhcpd.conf >/mnt/etc/vmware/udhcpd/udhcpd-vmnet1.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/vmchooser/smb.conf \
-          >/etc/vmware/smb.conf
+      [ -f /mnt/opt/openslx/plugin-repo/vmchooser/smb.conf \
+        -a -f /mnt/usr/sbin/smbd ] && \
+          sed -e "s,NWIF,$vmsub,;s,PIDDIR,/var/run/vmware," \
+            /mnt/opt/openslx/plugin-repo/vmchooser/smb.conf \
+            >/etc/vmware/smb.conf
     fi
 
     # vmware nat interface configuration
-- 
cgit v1.2.3-55-g7522