diff options
| author | Bryn M. Reeves <bmr@redhat.com> | 2013-04-25 18:21:50 +0100 |
|---|---|---|
| committer | Bryn M. Reeves <bmr@redhat.com> | 2013-04-25 18:21:50 +0100 |
| commit | 64d848606f4ab04d94668a09330b2e327828368c (patch) | |
| tree | b5392982c0c2de332905a39d7e67f6156d9d317b | |
| parent | ae0ed73bc855171b353fd0cf42a6dd75755b8c80 (diff) | |
| download | sos-64d848606f4ab04d94668a09330b2e327828368c.tar.gz | |
Fix cpu frequency data collection in hardware.py
The cpu frequency reporting on modern systems has moved from
cpufrequtils and the cpufreq command to kernel-tools and the
cpupower command.
Check for the respective packages and run the correct command.
Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
| -rw-r--r-- | sos/plugins/hardware.py | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/sos/plugins/hardware.py b/sos/plugins/hardware.py index 92c84829..f5e2816c 100644 --- a/sos/plugins/hardware.py +++ b/sos/plugins/hardware.py @@ -48,10 +48,16 @@ class hardware(Plugin): self.add_cmd_output("""echo -e "lspci:\n" ; lspci ; echo -e "\nlspci -nvv:\n" ; /sbin/lspci -nvv ; echo -e "\nlspci -tv:\n" ; /sbin/lspci -tv""", suggest_filename = "lspci", root_symlink = "lspci") self.add_cmd_output("dmidecode", root_symlink = "dmidecode") - - 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("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") if self.policy().get_arch().endswith("386"): self.add_cmd_output("x86info -a") |