Merge pull request #83 from Secure-24/add_oraclelinux_support

Add OracleLinux support
EncoreTechnologies · Jul 8, 2021 · 8bb82da · 8bb82da
2 parents 67f2c75 + 37fe563
commit 8bb82da
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 
 ## Development
 
+* Added support for Oracle Linux.
+
+  Contributed by Sean Millichamp (@seanmil)
+
 ## Release 1.5.1 (2021-07-08)
 
 * remove unused hiera configuration

diff --git a/files/bash/os_test.sh b/files/bash/os_test.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 if [ -e /etc/os-release ]; then
-  export OS_RELEASE=$(sed -n -e "/^ID=/p" /etc/os-release | sed -e 's~\(.*\)=\(.*\)~\U\2~g' -e 's~"~~g')
+  export OS_RELEASE=$(sed -n -e "/^ID=/p" /etc/os-release | sed -e 's~\(.*\)=\(.*\)~\U\2~g' -e 's~[" ]~~g')
 else
 # fall back to older methods for OS that do not use systemd
   export OS_TEST_DEB=$(lsb_release -a 2> /dev/null | grep Distributor | awk '{print $3}')
@@ -16,4 +16,4 @@ else
     # default
     export OS_RELEASE='UNKNOWN'
   fi
-fi
+fi
diff --git a/tasks/available_updates_linux.sh b/tasks/available_updates_linux.sh
@@ -5,7 +5,7 @@ source "${PT__installdir}/patching/files/bash/os_test.sh"
 
 case $OS_RELEASE in
 ################################################################################  
-  RHEL | CENTOS | FEDORA | ROCKY)
+  RHEL | CENTOS | FEDORA | ROCKY | OL)
     # RedHat variant
     source "${PT__installdir}/patching/files/bash/available_updates_rh.sh"
     ;;

diff --git a/tasks/cache_update_linux.sh b/tasks/cache_update_linux.sh
@@ -11,7 +11,7 @@ source "${PT__installdir}/patching/files/bash/os_test.sh"
 
 case $OS_RELEASE in
 ################################################################################
-  RHEL | CENTOS | FEDORA | ROCKY)
+  RHEL | CENTOS | FEDORA | ROCKY | OL)
     # RedHat variant
     # update yum cache
     OUTPUT=$(yum clean expire-cache 2>&1)

diff --git a/tasks/reboot_required_linux.sh b/tasks/reboot_required_linux.sh
@@ -8,7 +8,7 @@ export REBOOT_REQUIRED="false"
 
 case $OS_RELEASE in
 ################################################################################  
-  RHEL | CENTOS | FEDORA | ROCKY)
+  RHEL | CENTOS | FEDORA | ROCKY | OL)
     # RedHat variant
     source "${PT__installdir}/patching/files/bash/reboot_required_rh.sh"
     ;;

diff --git a/tasks/update_linux.sh b/tasks/update_linux.sh
@@ -24,7 +24,7 @@ STATUS=0
 
 case $OS_RELEASE in
 ################################################################################  
-  RHEL | CENTOS | FEDORA | ROCKY)
+  RHEL | CENTOS | FEDORA | ROCKY | OL)
     # RedHat variant
     source "${PT__installdir}/patching/files/bash/update_rh.sh"
     STATUS=$?