SOURCES: open-vm-tools-init - check if ESX is running and ommit starting no...

[pascalek]

Author: pascalek                     Date: Sat Jan 31 20:53:19 2009 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- check if ESX is running and ommit starting non-ESX sections

---- Files affected:
SOURCES:
   open-vm-tools-init (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/open-vm-tools-init
diff -u SOURCES/open-vm-tools-init:1.1 SOURCES/open-vm-tools-init:1.2
--- SOURCES/open-vm-tools-init:1.1	Fri Jan 16 12:10:56 2009
+++ SOURCES/open-vm-tools-init	Sat Jan 31 21:53:13 2009
@@ -13,6 +13,19 @@
 
 RETVAL=0
 
+is_ESX_running() {
+    if [ ! -f /usr/bin/vmware-checkvm ] ; then
+	echo no
+	return
+    fi
+    
+    if /usr/bin/vmware-checkvm -p | grep -q ESX; then
+	echo yes
+    else
+	echo no
+    fi
+}
+
 module_exist() {
 	module=$1
 	kver=`uname -r`
@@ -148,8 +161,10 @@
 
 start() {
 	start_vmxnet
-	start_vmblock
-	start_vmhgfs
+	if is_no `is_ESX_running`; then
+		start_vmblock
+		start_vmhgfs
+	fi
 	_modprobe single vmmemctl
 	_modprobe single vmci
 	_modprobe single vsock
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/open-vm-tools-init?r1=1.1&r2=1.2&f=u