diff --git a/SOURCES/sos-centos-branding.patch b/SOURCES/sos-centos-branding.patch index 86ab010..d29240a 100644 --- a/SOURCES/sos-centos-branding.patch +++ b/SOURCES/sos-centos-branding.patch @@ -1185,18 +1185,6 @@ diff -uNrp sos-3.0.orig/po/zu.po sos-3.0/po/zu.po msgstr "" #: ../sos/policyredhat.py:401 -diff -uNrp sos-3.2.orig/sos/plugins/cluster.py sos-3.2/sos/plugins/cluster.py ---- sos-3.2.orig/sos/plugins/cluster.py 2014-09-30 12:38:28.000000000 -0500 -+++ sos-3.2/sos/plugins/cluster.py 2015-03-09 14:58:02.982869116 -0500 -@@ -19,7 +19,7 @@ from datetime import datetime, timedelta - - - class Cluster(Plugin, RedHatPlugin): -- """Red Hat Cluster Suite and GFS -+ """Cluster Suite and GFS - """ - - plugin_name = 'cluster' diff -uNrp sos-3.2.orig/sos/plugins/cs.py sos-3.2/sos/plugins/cs.py --- sos-3.2.orig/sos/plugins/cs.py 2014-09-30 12:38:28.000000000 -0500 +++ sos-3.2/sos/plugins/cs.py 2015-03-09 14:58:20.085778645 -0500 @@ -1245,10 +1233,22 @@ diff -uNrp sos-3.2.orig/sos/plugins/rhui.py sos-3.2/sos/plugins/rhui.py """ plugin_name = 'rhui' +diff -uNrp sos-3.2.orig/sos/plugins/cluster.py sos-3.2/sos/plugins/cluster.py +--- sos-3.2.orig/sos/plugins/cluster.py 2015-12-01 08:21:22.494727682 -0600 ++++ sos-3.2/sos/plugins/cluster.py 2015-12-01 08:27:26.134127587 -0600 +@@ -20,7 +20,7 @@ from datetime import datetime, timedelta + + + class Cluster(Plugin, RedHatPlugin): +- """Red Hat Cluster High Availability and GFS2 ++ """Cluster High Availability and GFS2 + """ + + plugin_name = 'cluster' diff -uNrp sos-3.2.orig/sos/policies/redhat.py sos-3.2/sos/policies/redhat.py ---- sos-3.2.orig/sos/policies/redhat.py 2014-09-30 12:38:28.000000000 -0500 -+++ sos-3.2/sos/policies/redhat.py 2015-03-09 14:56:04.383496495 -0500 -@@ -33,9 +33,9 @@ except: +--- sos-3.2.orig/sos/policies/redhat.py 2015-12-01 08:21:22.528727534 -0600 ++++ sos-3.2/sos/policies/redhat.py 2015-12-01 08:25:33.638624468 -0600 +@@ -34,9 +34,9 @@ except: class RedHatPolicy(LinuxPolicy): @@ -1258,10 +1258,10 @@ diff -uNrp sos-3.2.orig/sos/policies/redhat.py sos-3.2/sos/policies/redhat.py + distro = "CentOS" + vendor = "CentOS" + vendor_url = "http://www.centos.org/" + _redhat_release = '/etc/redhat-release' _tmp_dir = "/var/tmp" - - def __init__(self): -@@ -57,9 +57,9 @@ class RedHatPolicy(LinuxPolicy): + _rpmq_cmd = 'rpm -qa --queryformat "%{NAME}|%{VERSION}\\n"' +@@ -74,9 +74,9 @@ class RedHatPolicy(LinuxPolicy): @classmethod def check(self): @@ -1269,11 +1269,18 @@ diff -uNrp sos-3.2.orig/sos/policies/redhat.py sos-3.2/sos/policies/redhat.py + """This method checks to see if we are running on CentOS. It must be overriden by concrete subclasses to return True when running on a - Fedora, RHEL or other Red Hat distribution or False otherwise.""" -+ CentOS or False otherwise.""" ++ Fedora, RHEL or other CentOS distribution or False otherwise.""" return False - def runlevel_by_service(self, name): -@@ -94,9 +94,9 @@ class RedHatPolicy(LinuxPolicy): + def _container_init(self): +@@ -123,15 +123,15 @@ class RedHatPolicy(LinuxPolicy): + def get_local_name(self): + return self.host_name() + +-# Container environment variables on Red Hat systems. ++# Container environment variables on CentOS systems. + ENV_CONTAINER_UUID = 'container_uuid' + ENV_HOST_SYSROOT = 'HOST' class RHELPolicy(RedHatPolicy): @@ -1286,3 +1293,12 @@ diff -uNrp sos-3.2.orig/sos/policies/redhat.py sos-3.2/sos/policies/redhat.py msg = _("""\ This command will collect diagnostic and configuration \ information from this %(distro)s system and installed \ +@@ -195,7 +195,7 @@ No changes will be made to system config + + + class RedHatAtomicPolicy(RHELPolicy): +- distro = "Red Hat Atomic Host" ++ distro = "CentOS Atomic Host" + msg = _("""\ + This command will collect diagnostic and configuration \ + information from this %(distro)s system.