aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBryn M. Reeves <bmr@redhat.com>2014-03-27 11:50:33 +0000
committerBryn M. Reeves <bmr@redhat.com>2014-03-27 11:50:33 +0000
commit426549369f818091935712936514382786502094 (patch)
treef64289891a26c94e2d4268ed5b784441259e83b2
parent1bd31b763a11f15c89b1e2ae16788867ff62a84e (diff)
downloadsos-426549369f818091935712936514382786502094.tar.gz
Clean up package checks in processor plugin
Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
-rw-r--r--sos/plugins/processor.py18
1 files changed, 6 insertions, 12 deletions
diff --git a/sos/plugins/processor.py b/sos/plugins/processor.py
index 391c64f7..0b236f8f 100644
--- a/sos/plugins/processor.py
+++ b/sos/plugins/processor.py
@@ -21,6 +21,8 @@ class Processor(Plugin, RedHatPlugin, UbuntuPlugin, DebianPlugin):
"""
plugin_name = 'processor'
+ files = ('/proc/cpuinfo',)
+ packages = ('cpufreq-utils')
def setup(self):
self.add_copy_specs([
@@ -29,21 +31,13 @@ class Processor(Plugin, RedHatPlugin, UbuntuPlugin, DebianPlugin):
"/sys/devices/system/cpu"
])
- if self.policy().pkg_by_name("cpufreq-utils"):
- self.add_cmd_output("cpufreq-info")
- self.add_cmd_output("cpupower info")
- self.add_cmd_output("cpupower frequency-info")
-
- if self.policy().pkg_by_name("kernel-tools"):
- self.add_cmd_output("cpupower info")
- self.add_cmd_output("cpupower frequency-info")
- self.add_cmd_output("cpupower idle-info")
+ self.add_cmd_output("lscpu")
+ self.add_cmd_output("cpupower info")
+ self.add_cmd_output("cpupower idle-info")
+ self.add_cmd_output("cpupower frequency-info")
if self.policy().get_arch().endswith("386"):
self.add_cmd_output("x86info -a")
- self.add_cmd_output("lscpu")
-
-
# vim: et ts=4 sw=4