aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpcarrier <pcarrier@ef72aa8b-4018-0410-8976-d6e080ef94d8>2011-02-07 13:19:13 +0000
committerpcarrier <pcarrier@ef72aa8b-4018-0410-8976-d6e080ef94d8>2011-02-07 13:19:13 +0000
commitb2b74fd63091290050b247712bf1e27961390fe8 (patch)
tree37f620c5876b85766389ed4b07ccb2a5bacf659e
parent27fa471cbf46fe20347041f16dc212c6899fa841 (diff)
downloadsos-b2b74fd63091290050b247712bf1e27961390fe8.tar.gz
[plugins] devicemapper: safer path handling for lvmdump
... and a cheaper alternative for yumdebug, unfortunately impossible in RHEL5 git-svn-id: svn+ssh://svn.fedorahosted.org/svn/sos/trunk@1075 ef72aa8b-4018-0410-8976-d6e080ef94d8
-rw-r--r--sos/plugins/devicemapper.py2
-rw-r--r--sos/plugins/yum.py2
2 files changed, 3 insertions, 1 deletions
diff --git a/sos/plugins/devicemapper.py b/sos/plugins/devicemapper.py
index 08fb3866..0c15dce6 100644
--- a/sos/plugins/devicemapper.py
+++ b/sos/plugins/devicemapper.py
@@ -26,7 +26,7 @@ class devicemapper(sos.plugintools.PluginBase):
def do_lvmdump(self):
"""Collects raw metadata directly from the PVs using dd
"""
- self.collectExtOutput("lvmdump -d %s" % os.path.join(self.cInfo['dstroot'],"lvmdump"))
+ self.collectExtOutput("lvmdump -d '%s'" % os.path.join(self.cInfo['dstroot'],"lvmdump"))
def setup(self):
self.collectExtOutput("/sbin/dmsetup info -c")
diff --git a/sos/plugins/yum.py b/sos/plugins/yum.py
index d669917a..3e35aaa3 100644
--- a/sos/plugins/yum.py
+++ b/sos/plugins/yum.py
@@ -51,6 +51,8 @@ class yum(sos.plugintools.PluginBase):
self.collectExtOutput("/usr/bin/yum list")
if self.getOption("yumdebug") and self.isInstalled('yum-utils'):
+ # RHEL6+ alternative for this whole function:
+ # self.collectExtOutput("/usr/bin/yum-debug-dump '%s'" % os.path.join(self.cInfo['dstroot'],"yum-debug-dump"))
ret, output, rtime = self.callExtProg("/usr/bin/yum-debug-dump")
try:
self.collectExtOutput("/bin/zcat %s" % (output.split()[-1],))