13178ca5fa
This synchronises sos in master to the current upstream sos-2.2 branch and includes all patches from RHEL6 not already present.
12 lines
626 B
Diff
12 lines
626 B
Diff
diff -up sos-2.2/sos/plugins/general.py.orig sos-2.2/sos/plugins/general.py
|
|
--- sos-2.2/sos/plugins/general.py.orig 2011-11-01 18:33:37.631824485 +0000
|
|
+++ sos-2.2/sos/plugins/general.py 2011-11-01 18:33:47.084880437 +0000
|
|
@@ -58,6 +58,7 @@ class general(sos.plugintools.PluginBase
|
|
self.addCopySpec("/etc/pki/entitlement/*.pem")
|
|
self.addCopySpec("/etc/rhsm/")
|
|
self.addForbiddenPath("/etc/pki/entitlement/key.pem")
|
|
+ self.addForbiddenPath("/etc/pki/entitlement/*-key.pem")
|
|
|
|
if self.getOption('all_logs'):
|
|
if rhelver == 5 or rhelver == 4:
|