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
631 B
Diff
12 lines
631 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-08-14 23:16:32.000000000 +0100
|
|
+++ sos-2.2/sos/plugins/general.py 2011-08-14 23:16:56.000000000 +0100
|
|
@@ -56,6 +56,7 @@ class general(sos.plugintools.PluginBase
|
|
self.addCopySpec("/etc/pki/product/*.pem")
|
|
self.addCopySpec("/etc/pki/consumer/cert.pem")
|
|
self.addCopySpec("/etc/pki/entitlement/*.pem")
|
|
+ self.addCopySpec("/etc/rhsm/")
|
|
self.addForbiddenPath("/etc/pki/entitlement/key.pem")
|
|
|
|
if self.getOption('all_logs'):
|