13178ca5fa
This synchronises sos in master to the current upstream sos-2.2 branch and includes all patches from RHEL6 not already present.
19 lines
812 B
Diff
19 lines
812 B
Diff
diff -up sos-2.2/sos/plugins/vmware.py.orig sos-2.2/sos/plugins/vmware.py
|
|
--- sos-2.2/sos/plugins/vmware.py.orig 2011-08-13 12:57:46.112712491 +0100
|
|
+++ sos-2.2/sos/plugins/vmware.py 2011-08-13 13:00:22.064760692 +0100
|
|
@@ -19,7 +19,7 @@ class vmware(sos.plugintools.PluginBase)
|
|
"""VMWare related information
|
|
"""
|
|
def checkenabled(self):
|
|
- if os.path.exists("/usr/bin/vmware"):
|
|
+ if os.path.exists("/usr/bin/vmware") or os.path.exists("/usr/init.d/vmware-tools"):
|
|
return True
|
|
return False
|
|
|
|
@@ -27,4 +27,5 @@ class vmware(sos.plugintools.PluginBase)
|
|
self.collectExtOutput("/usr/bin/vmware -v")
|
|
self.addCopySpec("/etc/vmware/locations")
|
|
self.addCopySpec("/etc/vmware/config")
|
|
+ self.addCopySpec("/proc/vmmemctl")
|
|
return
|