From 6684ba1f7b7eaa4950b07518d888f4576b6d5ded Mon Sep 17 00:00:00 2001
From: Johnny Hughes <johnny@centos.org>
Date: Mar 18 2020 13:00:37 +0000
Subject: refactor centos patch


---

diff --git a/SOURCES/sos-3.7-centos-branding.patch b/SOURCES/sos-3.7-centos-branding.patch
index 429db6b..606118d 100644
--- a/SOURCES/sos-3.7-centos-branding.patch
+++ b/SOURCES/sos-3.7-centos-branding.patch
@@ -1,7 +1,7 @@
-diff -uNrp sos-3.6.orig/sos/policies/redhat.py sos-3.6/sos/policies/redhat.py
---- sos-3.6.orig/sos/policies/redhat.py	2018-11-04 17:44:59.513116585 +0000
-+++ sos-3.6/sos/policies/redhat.py	2018-11-04 17:53:28.333731059 +0000
-@@ -32,9 +32,9 @@ OS_RELEASE = "/etc/os-release"
+diff -uNrp sos-3.7.orig/sos/policies/redhat.py sos-3.7/sos/policies/redhat.py
+--- sos-3.7.orig/sos/policies/redhat.py	2020-03-18 00:35:41.357473057 +0000
++++ sos-3.7/sos/policies/redhat.py	2020-03-18 00:37:31.569721326 +0000
+@@ -31,9 +31,9 @@ OS_RELEASE = "/etc/os-release"
  
  
  class RedHatPolicy(LinuxPolicy):
@@ -35,7 +35,37 @@ diff -uNrp sos-3.6.orig/sos/policies/redhat.py sos-3.6/sos/policies/redhat.py
  ENV_CONTAINER = 'container'
  ENV_HOST_SYSROOT = 'HOST'
  
-@@ -230,9 +230,9 @@ rhel_presets = {
+@@ -196,7 +196,7 @@ _cb_plugs = ['abrt', 'block', 'boot', 'd
+              'hardware', 'host', 'kernel', 'logs', 'lvm2', 'memory', 'rpm',
+              'process', 'systemd', 'yum', 'xfs']
+ 
+-RHEL_RELEASE_STR = "Red Hat Enterprise Linux"
++RHEL_RELEASE_STR = "CentOS Linux"
+ 
+ RHV = "rhv"
+ RHV_DESC = "Red Hat Virtualization"
+@@ -205,17 +205,17 @@ RHEL = "rhel"
+ RHEL_DESC = RHEL_RELEASE_STR
+ 
+ RHOSP = "rhosp"
+-RHOSP_DESC = "Red Hat OpenStack Platform"
++RHOSP_DESC = "RDO"
+ RHOSP_OPTS = SoSOptions(plugopts=[
+                              'process.lsof=off',
+                              'networking.ethtool_namespaces=False',
+                              'networking.namespaces=200'])
+ 
+ RHOCP = "ocp"
+-RHOCP_DESC = "OpenShift Container Platform by Red Hat"
++RHOCP_DESC = "OpenShift"
+ 
+ RH_SATELLITE = "satellite"
+-RH_SATELLITE_DESC = "Red Hat Satellite"
++RH_SATELLITE_DESC = "Satellite"
+ SAT_OPTS = SoSOptions(verify=True, plugopts=['apache.log=on'])
+ 
+ CB = "cantboot"
+@@ -253,9 +253,9 @@ No changes will be made to system config
  
  
  class RHELPolicy(RedHatPolicy):
@@ -48,7 +78,7 @@ diff -uNrp sos-3.6.orig/sos/policies/redhat.py sos-3.6/sos/policies/redhat.py
      msg = _("""\
  This command will collect diagnostic and configuration \
  information from this %(distro)s system and installed \
-@@ -262,7 +262,7 @@ No changes will be made to system config
+@@ -274,7 +274,7 @@ support representative.
      def check(cls):
          """Test to see if the running host is a RHEL installation.
  
@@ -57,7 +87,7 @@ diff -uNrp sos-3.6.orig/sos/policies/redhat.py sos-3.6/sos/policies/redhat.py
              release string at the beginning of the NAME field in the
              `/etc/os-release` file and returns ``True`` if it is
              found, and ``False`` otherwise.
-@@ -324,7 +324,7 @@ No changes will be made to system config
+@@ -343,7 +343,7 @@ class CentOsPolicy(RHELPolicy):
  
  ATOMIC = "atomic"
  ATOMIC_RELEASE_STR = "Atomic"
@@ -66,7 +96,7 @@ diff -uNrp sos-3.6.orig/sos/policies/redhat.py sos-3.6/sos/policies/redhat.py
  
  atomic_presets = {
      ATOMIC: PresetDefaults(name=ATOMIC, desc=ATOMIC_DESC, note=NOTE_TIME,
-@@ -333,7 +333,7 @@ atomic_presets = {
+@@ -352,7 +352,7 @@ atomic_presets = {
  
  
  class RedHatAtomicPolicy(RHELPolicy):
@@ -75,32 +105,3 @@ diff -uNrp sos-3.6.orig/sos/policies/redhat.py sos-3.6/sos/policies/redhat.py
      msg = _("""\
  This command will collect diagnostic and configuration \
  information from this %(distro)s system.
-diff -uNrp sos-3.7.orig/sos/policies/redhat.py sos-3.7/sos/policies/redhat.py
---- sos-3.7.orig/sos/policies/redhat.py	2019-08-07 15:24:23.198233507 +0000
-+++ sos-3.7/sos/policies/redhat.py	2019-08-07 15:29:08.324131718 +0000
-@@ -198,7 +198,7 @@ _cb_plugs = ['abrt', 'block', 'boot', 'd
-              'hardware', 'host', 'kernel', 'logs', 'lvm2', 'memory', 'rpm',
-              'process', 'systemd', 'yum', 'xfs']
- 
--RHEL_RELEASE_STR = "Red Hat Enterprise Linux"
-+RHEL_RELEASE_STR = "CentOS Linux"
- 
- RHV = "rhv"
- RHV_DESC = "Red Hat Virtualization"
-@@ -207,13 +207,13 @@ RHEL = "rhel"
- RHEL_DESC = RHEL_RELEASE_STR
- 
- RHOSP = "rhosp"
--RHOSP_DESC = "Red Hat OpenStack Platform"
-+RHOSP_DESC = "RDO"
- 
- RHOCP = "ocp"
--RHOCP_DESC = "OpenShift Container Platform by Red Hat"
-+RHOCP_DESC = "OpenShift"
- 
- RH_SATELLITE = "satellite"
--RH_SATELLITE_DESC = "Red Hat Satellite"
-+RH_SATELLITE_DESC = "Satellite"
- SAT_OPTS = SoSOptions(verify=True, plugopts=['apache.log=on'])
- 
- CB = "cantboot"