diff options
| author | navid <navid@ef72aa8b-4018-0410-8976-d6e080ef94d8> | 2007-12-14 10:36:15 +0000 |
|---|---|---|
| committer | navid <navid@ef72aa8b-4018-0410-8976-d6e080ef94d8> | 2007-12-14 10:36:15 +0000 |
| commit | 668647b482aeaaf0faeed8bb901d124185da2eee (patch) | |
| tree | 6766ee66104be38934c6ddff30dea6db417d5286 /src/lib | |
| parent | e201c1810c4b84f18efbde98bfe00845739ffaa5 (diff) | |
| download | sos-668647b482aeaaf0faeed8bb901d124185da2eee.tar.gz | |
added languages to rpm package
only obsolete sysreport if dist == rhel
activate workaround in xen plugin for BZ#371251
sos-internal.spec clean-up (as sos-html-logs was removed from source)
git-svn-id: svn+ssh://svn.fedorahosted.org/svn/sos/trunk@473 ef72aa8b-4018-0410-8976-d6e080ef94d8
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() |