diff options
| -rw-r--r-- | sos/plugins/general.py | 1 | ||||
| -rw-r--r-- | sos/plugins/s390.py | 6 | ||||
| -rwxr-xr-x | sos/policyredhat.py | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/sos/plugins/general.py b/sos/plugins/general.py index 87b7e310..c78e409c 100644 --- a/sos/plugins/general.py +++ b/sos/plugins/general.py @@ -47,6 +47,7 @@ class general(sos.plugintools.PluginBase): self.collectExtOutput("/bin/dmesg") self.addCopySpec("/root/anaconda-ks.cfg") self.collectExtOutput("/usr/sbin/alternatives --display java", root_symlink = "java") + self.collectExtOutput("/usr/bin/readlink -f /usr/bin/java") if self.getOption('all_logs'): rhelver = self.policy().rhelVersion() diff --git a/sos/plugins/s390.py b/sos/plugins/s390.py index ff938ca2..57e7eb5a 100644 --- a/sos/plugins/s390.py +++ b/sos/plugins/s390.py @@ -66,8 +66,8 @@ class s390(sos.plugintools.PluginBase): self.collectExtOutput("/sbin/fdasd -p %s" % (x,)) try: rhelver = self.policy().pkgByName("redhat-release")[1] + if rhelver == "5": + self.collectExtOutput("/sbin/lsqeth") + self.collectExtOutput("/sbin/lszfcp") except: rhelver = None - if rhelver.startswith("5"): - self.collectExtOutput("/sbin/lsqeth") - self.collectExtOutput("/sbin/lszfcp") diff --git a/sos/policyredhat.py b/sos/policyredhat.py index 6cda8556..0bf39dbe 100755 --- a/sos/policyredhat.py +++ b/sos/policyredhat.py @@ -158,6 +158,8 @@ class SosPolicy: return 4 elif pkgname in [ "5Server", "5Client" ]: return 5 + elif pkgname == "6": + return 6 except: pass return False |