rpms/open-vm-tools/F-13 open-vm-tools-guestd.init,1.3,1.4

[Denis Leroy]

Author: denis

Update of /cvs/free/rpms/open-vm-tools/F-13
In directory se02.es.rpmfusion.net:/tmp/cvs-serv25897

Modified Files:
	open-vm-tools-guestd.init 
Log Message:
Make loading of vmmemctl module conditional on absence of vmware_balloon, since F-13 spans both 2.6.33 and 2.6.34 kernels


Index: open-vm-tools-guestd.init
===================================================================
RCS file: /cvs/free/rpms/open-vm-tools/F-13/open-vm-tools-guestd.init,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- open-vm-tools-guestd.init	20 Mar 2010 13:54:14 -0000	1.3
+++ open-vm-tools-guestd.init	5 Oct 2010 09:52:42 -0000	1.4
@@ -21,13 +21,19 @@
 OPTIONS="-b $PID_FILE"
 DND_DIR="/tmp/VMwareDnD"
 
+has_balloon()
+{
+    bminfo=`/sbin/modinfo vmware_balloon > /dev/null 2>&1`
+    return $?
+}
+
 setup_modules()
 {
 	[ ! -d "$DND_DIR" ] && mkdir -m 1777 $DND_DIR
 	modprobe vmsync
 	modprobe vmci
 	modprobe vsock
-	modprobe vmmemctl
+	has_balloon || modprobe vmmemctl
 	modprobe vmhgfs
 	modprobe vmblock
 	sleep 1