[or-cvs] r16426: Cleaner way to deal with skipping vmware-tools init script w (incognito/trunk/root_overlay/var/patches)

[anonym at seul.org]

Author: anonym
Date: 2008-08-05 12:55:53 -0400 (Tue, 05 Aug 2008)
New Revision: 16426

Modified:
   incognito/trunk/root_overlay/var/patches/vmware-tools-init.patch
Log:
Cleaner way to deal with skipping vmware-tools init script when not running in VMWare.


Modified: incognito/trunk/root_overlay/var/patches/vmware-tools-init.patch
===================================================================
--- incognito/trunk/root_overlay/var/patches/vmware-tools-init.patch	2008-08-05 16:54:31 UTC (rev 16425)
+++ incognito/trunk/root_overlay/var/patches/vmware-tools-init.patch	2008-08-05 16:55:53 UTC (rev 16426)
@@ -1,13 +1,12 @@
---- etc/init.d/vmware-tools.orig	2008-08-01 12:28:27.960752468 +0000
-+++ etc/init.d/vmware-tools	2008-08-01 12:36:42.745241617 +0000
-@@ -15,6 +15,13 @@
+--- etc/init.d/vmware-tools.orig	2008-08-02 18:13:32.547755260 +0000
++++ etc/init.d/vmware-tools	2008-08-02 18:13:08.945754901 +0000
+@@ -15,6 +15,12 @@
  }
  
  start() {
 +	vmware-checkvm &> /dev/null
 +	if [ $? -ne 0 ]; then
-+		ebegin "vmware-tools should not be started when outside of VMWare, skipping"
-+		eend 0
++		ewarn "vmware-tools does nothing when running outside of VMWare"
 +		return 0
 +	fi
 +