89b86368f8
Update sos in rawhide to the upstream 3.2 release and additional patches including the fix for CVE-2015-7529.
36 lines
1.2 KiB
Diff
36 lines
1.2 KiB
Diff
From f2d9cc519ac549b9e68e1301b67f1e9b789e2fd3 Mon Sep 17 00:00:00 2001
|
|
From: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>
|
|
Date: Fri, 3 Jul 2015 12:16:25 +0100
|
|
Subject: [PATCH] iprconfig collects information, only if the underlying
|
|
platform is 'ppc64'. Modify check_enabled() to regex match on arch(), instead
|
|
of exact match of string.
|
|
|
|
This enables iprconfig to collect information on ppc64*
|
|
platforms.
|
|
|
|
Signed-off-by: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>
|
|
Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
|
|
---
|
|
sos/plugins/iprconfig.py | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
---
|
|
sos/plugins/iprconfig.py | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/sos/plugins/iprconfig.py b/sos/plugins/iprconfig.py
|
|
index b77c192..687d8d5 100644
|
|
--- a/sos/plugins/iprconfig.py
|
|
+++ b/sos/plugins/iprconfig.py
|
|
@@ -28,7 +28,7 @@ class IprConfig(Plugin, RedHatPlugin, UbuntuPlugin, DebianPlugin):
|
|
|
|
def check_enabled(self):
|
|
arch = self.policy().get_arch()
|
|
- return arch == "ppc64" and is_executable("iprconfig")
|
|
+ return "ppc64" in arch and is_executable("iprconfig")
|
|
|
|
def setup(self):
|
|
self.add_cmd_output([
|
|
--
|
|
1.8.3.1
|
|
|