13178ca5fa
This synchronises sos in master to the current upstream sos-2.2 branch and includes all patches from RHEL6 not already present.
13 lines
922 B
Diff
13 lines
922 B
Diff
diff -up sos-2.2/sos/plugins/hardware.py.orig sos-2.2/sos/plugins/hardware.py
|
|
--- sos-2.2/sos/plugins/hardware.py.orig 2011-09-23 15:34:51.000000000 +0100
|
|
+++ sos-2.2/sos/plugins/hardware.py 2011-09-23 15:34:58.000000000 +0100
|
|
@@ -36,7 +36,7 @@ class hardware(sos.plugintools.PluginBas
|
|
self.addCopySpec("/proc/s390dbf/tape")
|
|
self.addCopySpec("/sys/bus/scsi")
|
|
self.addCopySpec("/sys/state")
|
|
- self.collectExtOutput("/usr/share/rhn/up2date_client/hardware.py")
|
|
+ self.collectExtOutput("python /usr/share/rhn/up2date_client/hardware.py", suggest_filename="hardware.py")
|
|
self.collectExtOutput("""/bin/echo -e "lspci:\n" ; /sbin/lspci ; /bin/echo -e "\nlspci -nvv:\n" ; /sbin/lspci -nvv ; /bin/echo -e "\nlspci -tv:\n" ; /sbin/lspci -tv""", suggest_filename = "lspci", root_symlink = "lspci")
|
|
|
|
self.collectExtOutput("/usr/sbin/dmidecode", root_symlink = "dmidecode")
|