[Devil-linux-commit] build/scripts/scripts vmware,1.4,1.5

[Heiko Z. <smi...@us...>]

Update of /cvsroot/devil-linux/build/scripts/scripts
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv2148/scripts/scripts

Modified Files:
	vmware 
Log Message:
- updated awstats-6.8
- updated bonnie++-1.03e
- updated db-4.7.25
- updated dnsmasq-2.46
- updated file-4.26
- updated glib-2.18.3
- updated httpd-2.2.11
- updated kbd-1.15
- updated l7-protocols-2008-12-18
- updated lftp-3.7.7
- updated libpng-1.2.34
- updated mtools-4.0.1
- updated ncftp-3.2.2-src
- updated netfilter-layer7-v2.21
- updated ntp-4.2.4p6
- updated open-vm-tools-2008.12.23-137496
- updated postfix-2.5.6
- updated quota-3.17
- updated shorewall-common-4.2.4
- updated shorewall-perl-4.2.4.5
- updated shorewall-shell-4.2.4
- updated snort-2.8.3.1
- updated strace-4.5.18
- updated syslinux-3.72
- updated sysstat-8.1.7
- updated tar-1.21
- updated tftp-hpa-0.49


Index: vmware
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/scripts/vmware,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- vmware	9 Apr 2008 13:09:18 -0000	1.4
+++ vmware	9 Jan 2009 20:05:49 -0000	1.5
@@ -41,9 +41,15 @@
 case "$1" in
 	start)
 		echo "VMWare Virtual Machine detected"
-    		echo "Loading VMWare modules"
-	    	modprobe vmmemctl
+		echo "Unloading PCNET32"
+		rmmod pcnet32
+
+		# we already did load the vmmware modules in the boot script
+		# but let's make sure they're here in case somebody 
+		# restarted this script
 		modprobe vmxnet
+		modprobe vmmemctl
+		sleep 2
 		
 		echo -n "Starting $NAME: "
 		loadproc $DAEMON $PARAMETER