|
 |
4087f6 |
From 0c83c8245ffab2ff3f568078651553f59ef475bb Mon Sep 17 00:00:00 2001
|
|
|
4087f6 |
From: Martin Perina <mperina@redhat.com>
|
|
|
4087f6 |
Date: Wed, 21 Aug 2019 11:17:44 +0200
|
|
|
4087f6 |
Subject: [PATCH] [vdsm]: Fix executing shell commands
|
|
|
4087f6 |
|
|
|
4087f6 |
During review process of [1] it was suggested to replace '/bin/sh' with
|
|
|
4087f6 |
just 'sh', but unfortunately this change caused an error to not include
|
|
|
4087f6 |
information about VDSM mount points as described in [2]. This fix
|
|
|
4087f6 |
restores previous state and add full path to shell executions.
|
|
|
4087f6 |
|
|
|
4087f6 |
[1] https://github.com/sosreport/sos/pull/1205
|
|
|
4087f6 |
[2] https://bugzilla.redhat.com/1743304
|
|
|
4087f6 |
|
|
|
4087f6 |
Resolves: #1761
|
|
|
4087f6 |
|
|
|
4087f6 |
Signed-off-by: Martin Perina <mperina@redhat.com>
|
|
|
4087f6 |
Signed-off-by: Pavel Moravec <pmoravec@redhat.com>
|
|
|
4087f6 |
---
|
|
|
4087f6 |
sos/plugins/vdsm.py | 4 ++--
|
|
|
4087f6 |
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
4087f6 |
|
|
|
4087f6 |
diff --git a/sos/plugins/vdsm.py b/sos/plugins/vdsm.py
|
|
|
4087f6 |
index 35eec5093..c4e2af5f6 100644
|
|
|
4087f6 |
--- a/sos/plugins/vdsm.py
|
|
|
4087f6 |
+++ b/sos/plugins/vdsm.py
|
|
|
4087f6 |
@@ -93,8 +93,8 @@ def setup(self):
|
|
|
4087f6 |
])
|
|
|
4087f6 |
self.add_cmd_output([
|
|
|
4087f6 |
"ls -ldZ /etc/vdsm",
|
|
|
4087f6 |
- "su vdsm -s sh -c 'tree -l /rhev/data-center'",
|
|
|
4087f6 |
- "su vdsm -s sh -c 'ls -lR /rhev/data-center'"
|
|
|
4087f6 |
+ "su vdsm -s /bin/sh -c 'tree -l /rhev/data-center'",
|
|
|
4087f6 |
+ "su vdsm -s /bin/sh -c 'ls -lR /rhev/data-center'"
|
|
|
4087f6 |
])
|
|
|
4087f6 |
self.add_cmd_output([
|
|
|
4087f6 |
"lvm vgs -v -o +tags --config \'%s\'" % LVM_CONFIG,
|