diff options
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/sos/plugins/xen.py | 5 | ||||
| -rwxr-xr-x | src/lib/sos/policyredhat.py | 1 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/lib/sos/plugins/xen.py b/src/lib/sos/plugins/xen.py index d6daec63..89ed359f 100644 --- a/src/lib/sos/plugins/xen.py +++ b/src/lib/sos/plugins/xen.py @@ -68,7 +68,10 @@ class xen(sos.plugintools.PluginBase): self.collectExtOutput("/usr/sbin/xm info") self.collectExtOutput("/usr/sbin/brctl show") self.domCollectProc() - self.addCopySpec("/sys/hypervisor") + # work-around for BZ#371251 which eventually needs to be fixed in xen + status, output = commands.getstatusoutput("/sbin/service xend status &> /dev/null") + if status == 0: + self.addCopySpec("/sys/hypervisor") # FIXME: we *might* want to collect things in /sys/bus/xen*, # /sys/class/xen*, /sys/devices/xen*, /sys/modules/blk*, # /sys/modules/net*, but I've never heard of them actually being diff --git a/src/lib/sos/policyredhat.py b/src/lib/sos/policyredhat.py index c8bec998..a10e7dfb 100755 --- a/src/lib/sos/policyredhat.py +++ b/src/lib/sos/policyredhat.py @@ -363,5 +363,6 @@ class SosPolicy: print " " + upload_name print print _("Please communicate this name to your support representative.") + print fp.close() |