From 1ef986e54b9461604a8fb0315d44811fc4967ff7 Mon Sep 17 00:00:00 2001 From: pcarrier Date: Fri, 11 Feb 2011 15:36:46 +0000 Subject: [plugins] hardware.py: handling /usr/share/rhn/up2date*client/hardware.py paths Covers RHBZ#572353. git-svn-id: svn+ssh://svn.fedorahosted.org/svn/sos/trunk@1081 ef72aa8b-4018-0410-8976-d6e080ef94d8 --- sos/plugins/hardware.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sos/plugins/hardware.py b/sos/plugins/hardware.py index 2aabcce5..c677edce 100644 --- a/sos/plugins/hardware.py +++ b/sos/plugins/hardware.py @@ -13,6 +13,7 @@ ## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. import sos.plugintools +from glob import glob class hardware(sos.plugintools.PluginBase): """hardware related information @@ -36,7 +37,7 @@ class hardware(sos.plugintools.PluginBase): "/proc/s390dbf/tape", "/sys/bus/scsi", "/sys/state"]) - self.collectExtOutput("/usr/share/rhn/up2dateclient/hardware.py") + self.collectExtOutput(glob("/usr/share/rhn/up2date*client/hardware.py")[0]) # RHBZ#572353 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") -- cgit