More changes regarding Vbox and virtualization ...

7 files changed, 7 insertions, 19 deletions

diff --git a/src/os-plugins/plugins/qemukvm/XX_qemukvm.sh b/src/os-plugins/plugins/qemukvm/XX_qemukvm.sh
index da3c998e..9579b056 100644
--- a/src/os-plugins/plugins/qemukvm/XX_qemukvm.sh
+++ b/src/os-plugins/plugins/qemukvm/XX_qemukvm.sh
@@ -109,7 +109,7 @@ 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/virtualization/smb.conf -a \
+    if [ -f /mnt/opt/openslx/plugins/vmchooser/smb.conf -a \
       -f /mnt/usr/sbin/smbd ] ; then 
       testmkd /mnt/etc/qemu
       sed -e "s#NWIF#tapnat0#taphost0#;s#PIDDIR#/tmp/virt#" \
diff --git a/src/os-plugins/plugins/virtualbox/XX_virtualbox.sh b/src/os-plugins/plugins/virtualbox/XX_virtualbox.sh
index 161825ea..adacc556 100644
--- a/src/os-plugins/plugins/virtualbox/XX_virtualbox.sh
+++ b/src/os-plugins/plugins/virtualbox/XX_virtualbox.sh
@@ -90,7 +90,7 @@ if [ -e ${CONFFILE} ]; then
     chown root:vboxusers /dev/vboxdrv
 
     # setting the base samba configuration
-    [ -f /mnt/opt/openslx/plugins/virtualization/smb.conf -a -f /mnt/usr/sbin/smbd ] && \
+    [ -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/etc/vbox/smb.conf
diff --git a/src/os-plugins/plugins/virtualbox/files/run-virt.include b/src/os-plugins/plugins/virtualbox/files/run-virt.include
index 374b4b19..48f95f22 100644
--- a/src/os-plugins/plugins/virtualbox/files/run-virt.include
+++ b/src/os-plugins/plugins/virtualbox/files/run-virt.include
@@ -251,11 +251,6 @@ fi
 #  fi
 #  #permem=40
 #  #mem=$(expr ${totalmem} * ${permem})
-#  if [ "${mem}" -lt "256" ] || [ "${hostmem}" -lt "256" ]; then
-#    writelog "Memory out of range: ${mem} MB (guest) / ${hostmem} MB (host)!"
-#    writelog "Min. 256 MB for host and guest!"
-#    cleanexit 1
-#  fi
 #fi
 
 # translate network cards
diff --git a/src/os-plugins/plugins/vmchooser/OpenSLX/OSPlugin/vmchooser.pm b/src/os-plugins/plugins/vmchooser/OpenSLX/OSPlugin/vmchooser.pm
index 02381d33..5889b346 100644
--- a/src/os-plugins/plugins/vmchooser/OpenSLX/OSPlugin/vmchooser.pm
+++ b/src/os-plugins/plugins/vmchooser/OpenSLX/OSPlugin/vmchooser.pm
@@ -1,4 +1,4 @@
-# Copyright (c) 2008, 2009 - OpenSLX GmbH
+# Copyright (c) 2008, 2012 - OpenSLX GmbH
 #
 # This program is free software distributed under the GPL version 2.
 # See http://openslx.org/COPYING
@@ -137,7 +137,7 @@ sub installationPhase
     my $pluginName = $self->{'name'};
     my $pluginBasePath = "$openslxBasePath/lib/plugins/$pluginName/files";
     foreach my $file ( qw( vmchooser printer.sh scanner.sh xmlfilter.sh 
-        default.desktop mesgdisp run-virt.sh ) ) {
+        default.desktop mesgdisp run-virt.sh smb.conf ) ) {
         copyFile("$pluginBasePath/$file", "$pluginRepoPath/");
         chmod 0755, "$pluginRepoPath/$file";
     }
diff --git a/src/os-plugins/plugins/vmchooser/XX_vmchooser.sh b/src/os-plugins/plugins/vmchooser/XX_vmchooser.sh
index 9fcc1c39..f86d96d3 100644
--- a/src/os-plugins/plugins/vmchooser/XX_vmchooser.sh
+++ b/src/os-plugins/plugins/vmchooser/XX_vmchooser.sh
@@ -87,8 +87,8 @@ ALL ALL=NOPASSWD: /sbin/mdadm -C /dev/md0 -l linear --raid-devices=2 /dev/loop*
 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: /usr/sbin/nmbd -s /etc/*/smb.conf
+ALL ALL=NOPASSWD: /usr/sbin/smbd -s /etc/*/smb.conf
 ALL ALL=NOPASSWD: /opt/openslx/rootfs/usr/bin/killall nmbd smbd
 EOF
 
diff --git a/src/os-plugins/plugins/vmware/XX_vmware.sh b/src/os-plugins/plugins/vmware/XX_vmware.sh
index 7a953eae..eee8b17f 100644
--- a/src/os-plugins/plugins/vmware/XX_vmware.sh
+++ b/src/os-plugins/plugins/vmware/XX_vmware.sh
@@ -76,7 +76,7 @@ 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/virtualization/smb.conf -a -f /mnt/usr/sbin/smbd ] && \
+      [ -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 \
           >/etc/vmware/smb.conf
diff --git a/src/os-plugins/plugins/vmware/files/run-virt.include b/src/os-plugins/plugins/vmware/files/run-virt.include
index 86efb1a8..d38e5dff 100644
--- a/src/os-plugins/plugins/vmware/files/run-virt.include
+++ b/src/os-plugins/plugins/vmware/files/run-virt.include
@@ -456,13 +456,6 @@ done
 writelog "# File created by $0 (VMversion ${vmversion})\n# on $(date)\n"
 writelog "Starting with non-persistent mode ...\n"
 
-# check memory range
-if [ "${mem}" -lt "256" ] || [ "${hostmem}" -lt "256" ]; then
-  writelog "\tMemory out of range: ${mem} MB (guest) / ${hostmem} MB (host)!"
-  writelog "\tMin. 256 MB for host and guest!"
-  exit 1
-fi
-
 # write all results to logfile
 # log disksetup
 writelog "Directories:"