From 74be7469519e6201dd345359e5a396b2a8fafd6b Mon Sep 17 00:00:00 2001
From: Dirk
Date: Tue, 27 Nov 2012 15:49:43 +0100
Subject: Working on VirtualBox for OpenSLX clients ... (including changes for
 vmchooser)

---
 src/os-plugins/plugins/vmchooser/XX_vmchooser.sh   | 7 +++++++
 src/os-plugins/plugins/vmchooser/files/run-virt.sh | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

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

diff --git a/src/os-plugins/plugins/vmchooser/XX_vmchooser.sh b/src/os-plugins/plugins/vmchooser/XX_vmchooser.sh
index cd6d54e5..9fcc1c39 100644
--- a/src/os-plugins/plugins/vmchooser/XX_vmchooser.sh
+++ b/src/os-plugins/plugins/vmchooser/XX_vmchooser.sh
@@ -78,11 +78,18 @@ if [ -e $CONFFILE ]; then
 
     # enable normal users to setup the extended virtual machine redo file space
     # and image source via network block device (NBD only at the moment)
+    # allow to start/stop samba on virtual devices (latter one ignores multiple
+    # independent daemons) 
     cat >> /mnt/etc/sudoers << EOF
 # allow to start and stop the special /tmp redo file space (RAM + NBD/NFS server RAID)
 ALL ALL=NOPASSWD: /sbin/losetup /dev/loop* 
 ALL ALL=NOPASSWD: /sbin/mdadm -C /dev/md0 -l linear --raid-devices=2 /dev/loop* /dev/*
 ALL ALL=NOPASSWD: /opt/openslx/rootfs/usr/sbin/nbd-client * * /dev/nbd*
+# allow to configure and start/stop samba services
+ALL ALL=NOPASSWD: /opt/openslx/rootfs/bin/sed -i /etc/*/smb.conf -e *
+ALL ALL=NOPASSWD: /usr/sbin/nmbd -c /etc/*/smb.conf
+ALL ALL=NOPASSWD: /usr/sbin/smbd -c /etc/*/smb.conf
+ALL ALL=NOPASSWD: /opt/openslx/rootfs/usr/bin/killall nmbd smbd
 EOF
 
     # finished ...
diff --git a/src/os-plugins/plugins/vmchooser/files/run-virt.sh b/src/os-plugins/plugins/vmchooser/files/run-virt.sh
index 5a03e63f..b3863a2e 100644
--- a/src/os-plugins/plugins/vmchooser/files/run-virt.sh
+++ b/src/os-plugins/plugins/vmchooser/files/run-virt.sh
@@ -364,7 +364,7 @@ esac
 
 # Enable 3D
 enable3d=$(grep -i "<enable3d param=.*" ${xmlfile} 2>/dev/null | \
-           awk -F '=' {'print $2'})
+           awk -F '=' {'print $2'} | tr "[A-Z]" "[a-z]")
 
 # Add rw share
 sharepath="${HOME}"
-- 
cgit v1.2.3-55-g7522