From 740b989dff68c8c7bbe58d685a2d925e359606ce Mon Sep 17 00:00:00 2001
From: "Bryn M. Reeves" <bmr@redhat.com>
Date: Mon, 26 Jan 2015 00:00:08 +0000
Subject: [PATCH 66/93] [cluster] handle crm_report with --sysroot
Don't attempt to run crm_report in the chroot if tmp is not a
subdirectory of sysroot.
Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
---
sos/plugins/cluster.py | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/sos/plugins/cluster.py b/sos/plugins/cluster.py
index ecfaa7b..2e4ed0e 100644
--- a/sos/plugins/cluster.py
+++ b/sos/plugins/cluster.py
@@ -104,8 +104,9 @@ class Cluster(Plugin, RedHatPlugin):
"default" % self.get_option('crm_from'))
crm_dest = self.get_cmd_output_path(name='crm_report')
- self.add_cmd_output('crm_report -S -d --dest %s --from "%s"'
- % (crm_dest, crm_from))
+ crm_cmd = 'crm_report -S -d --dest %s --from "%s"'
+ self.add_cmd_output(crm_cmd % (crm_dest, crm_from),
+ chroot=self.tmp_in_sysroot())
def do_lockdump(self):
dlm_tool = "dlm_tool ls"
--
1.9.3