From 198f4645f186fdb3b6b5a2ad63bc1b0fd1890f79 Mon Sep 17 00:00:00 2001
From: Dirk
Date: Tue, 27 Nov 2012 23:11:30 +0100
Subject: ...

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

diff --git a/src/os-plugins/plugins/qemukvm/files/run-virt.include b/src/os-plugins/plugins/qemukvm/files/run-virt.include
index de0109a3..868acbfc 100644
--- a/src/os-plugins/plugins/qemukvm/files/run-virt.include
+++ b/src/os-plugins/plugins/qemukvm/files/run-virt.include
@@ -249,7 +249,7 @@ writelog "\tNetwork kind:\t\t${network_kind}"
 
 # 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/qemu/smb.conf -e "s,$USER,USER,"
+  sudo /opt/openslx/rootfs/bin/sed -i /etc/qemu/smb.conf -e "s,USER,$USER,"
   sudo /usr/sbin/nmbd -s /etc/qemu/smb.conf
   sudo /usr/sbin/smbd -s /etc/qemu/smb.conf
 fi
diff --git a/src/os-plugins/plugins/virtualbox/files/run-virt.include b/src/os-plugins/plugins/virtualbox/files/run-virt.include
index 694b65fe..4f07d8d6 100644
--- a/src/os-plugins/plugins/virtualbox/files/run-virt.include
+++ b/src/os-plugins/plugins/virtualbox/files/run-virt.include
@@ -410,7 +410,7 @@ 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 /opt/openslx/rootfs/bin/sed -i /etc/vbox/smb.conf -e "s,USER,$USER,"
   sudo /usr/sbin/nmbd -s /etc/vbox/smb.conf
   sudo /usr/sbin/smbd -s /etc/vbox/smb.conf
 fi
diff --git a/src/os-plugins/plugins/vmware/XX_vmware.sh b/src/os-plugins/plugins/vmware/XX_vmware.sh
index 2b51936d..6a43b8d4 100644
--- a/src/os-plugins/plugins/vmware/XX_vmware.sh
+++ b/src/os-plugins/plugins/vmware/XX_vmware.sh
@@ -80,7 +80,7 @@ stage3 setup" > ${PLUGINCONFDIR}/vmware.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
+            >/mnt/etc/vmware/smb.conf
     fi
 
     # vmware nat interface configuration
diff --git a/src/os-plugins/plugins/vmware/files/run-virt.include b/src/os-plugins/plugins/vmware/files/run-virt.include
index 621f31db..e91f5e4b 100644
--- a/src/os-plugins/plugins/vmware/files/run-virt.include
+++ b/src/os-plugins/plugins/vmware/files/run-virt.include
@@ -505,7 +505,7 @@ 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 /opt/openslx/rootfs/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
-- 
cgit v1.2.3-55-g7522