aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sos/plugins/amd.py1
-rw-r--r--sos/plugins/emc.py6
-rw-r--r--sos/plugins/hardware.py1
-rw-r--r--sos/plugins/rhn.py3
-rw-r--r--sos/plugins/systemtap.py6
5 files changed, 3 insertions, 14 deletions
diff --git a/sos/plugins/amd.py b/sos/plugins/amd.py
index 1cdd067d..c0fd930b 100644
--- a/sos/plugins/amd.py
+++ b/sos/plugins/amd.py
@@ -26,6 +26,5 @@ class amd(sos.plugintools.PluginBase):
def setup(self):
self.addCopySpecs("/etc/amd.*")
- self.collectExtOutput("/bin/rpm -qV am-utils")
self.collectExtOutput("/bin/egrep -e 'automount|pid.*nfs' /proc/mounts")
self.collectExtOutput("/bin/mount | egrep -e 'automount|pid.*nfs'")
diff --git a/sos/plugins/emc.py b/sos/plugins/emc.py
index 70c27276..843e7ef1 100644
--- a/sos/plugins/emc.py
+++ b/sos/plugins/emc.py
@@ -154,8 +154,7 @@ class emc(sos.plugintools.PluginBase):
add_about_emc="no"
## If PowerPath is installed collect PowerPath specific information
- emc_pp_installed = Popen("/bin/rpm -qa | /bin/grep -i EMCpower", shell=True, stdout=PIPE).stdout.read()
- if emc_pp_installed != "":
+ if self.isInstalled("EMCpower"):
print "EMC PowerPath is installed."
print " Gathering EMC PowerPath information..."
self.addCustomText("EMC PowerPath is installed.<br>")
@@ -169,8 +168,7 @@ class emc(sos.plugintools.PluginBase):
self.get_pp_config()
## If Solutions Enabler is installed collect Symmetrix/DMX specific information
- emc_symcli_installed = Popen("/bin/rpm -qa | /bin/grep -i symcli-symcli", shell=True, stdout=PIPE).stdout.read()
- if emc_symcli_installed != "":
+ if len(self.allPkgsByNameRegex('[Ss][Yy][Mm][Cc][Ll][Ii]-[Ss][Yy][Mm][Cc][Ll][Ii]')) > 0:
print "EMC Solutions Enabler SYMCLI is installed."
print " Gathering EMC Solutions Enabler SYMCLI information..."
self.addCustomText("EMC Solutions Enabler is installed.<br>")
diff --git a/sos/plugins/hardware.py b/sos/plugins/hardware.py
index 62f0af02..2aabcce5 100644
--- a/sos/plugins/hardware.py
+++ b/sos/plugins/hardware.py
@@ -31,7 +31,6 @@ class hardware(sos.plugintools.PluginBase):
"/proc/ide",
"/proc/bus",
"/etc/stinit.def",
- "/etc/sysconfig/hwconf",
"/proc/chandev",
"/proc/dasd",
"/proc/s390dbf/tape",
diff --git a/sos/plugins/rhn.py b/sos/plugins/rhn.py
index e6d76fc1..73bb7e8a 100644
--- a/sos/plugins/rhn.py
+++ b/sos/plugins/rhn.py
@@ -61,7 +61,6 @@ class rhn(sos.plugintools.PluginBase):
"/var/log/nocpulse/TSDBLocalQueue/TSDBLocalQueue.log"])
self.addCopySpec("/root/ssl-build")
- self.collectExtOutput("rpm -qa --last", root_symlink = "rpm-manifest")
self.collectExtOutput("/usr/bin/rhn-schema-version", root_symlink = "database-schema-version")
self.collectExtOutput("/usr/bin/rhn-charsets", root_symlink = "database-character-sets")
@@ -79,4 +78,4 @@ class rhn(sos.plugintools.PluginBase):
# def diagnose(self):
# RHN Proxy:
- # * /etc/sysconfig/rhn/systemid is owned by root.apache with the permissions 0640
+ # * /etc/g/rhn/systemid is owned by root.apache with the permissions 0640
diff --git a/sos/plugins/systemtap.py b/sos/plugins/systemtap.py
index 47bc30de..ff44d983 100644
--- a/sos/plugins/systemtap.py
+++ b/sos/plugins/systemtap.py
@@ -25,11 +25,5 @@ class systemtap(sos.plugintools.PluginBase):
return sos.plugintools.PluginBase.checkenabled(self)
def setup(self):
- self.collectExtOutput("/bin/rpm -qa 'kernel*' systemtap elfutils --nosignature --nodigest \
- | egrep -e kernel.*`uname -r | sed 's/xen//'` \
- -e systemtap \
- -e elfutils \
- | sort")
- #self.collectExtOutput("/bin/rpm -qa 'kernel*' systemtap elfutils --nosignature --nodigest | /bin/egrep -e kernel.*`uname -r` -e systemtap -e elfutils | sort")
self.collectExtOutput("/usr/bin/stap -V 2")
self.collectExtOutput("/bin/uname -r")