From 8d839d1a82ba1852f8e703e5a54283a443c62ae7 Mon Sep 17 00:00:00 2001
From: Dirk
Date: Tue, 27 Nov 2012 22:35:06 +0100
Subject: More changes regarding Vbox and virtualization ...

---
 src/os-plugins/plugins/vmware/XX_vmware.sh           | 2 +-
 src/os-plugins/plugins/vmware/files/run-virt.include | 7 -------
 2 files changed, 1 insertion(+), 8 deletions(-)

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

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:"
-- 
cgit v1.2.3-55-g7522