Merge pull request #463 from M1Screw/master

Fix RHEL 9 installation

include/check_os.sh

@@ -76,6 +76,10 @@ elif [ -e "/etc/oracle-release" ]; then
   Family=rhel
   Platform=Oracle
   grep -Eqi "release 9." /etc/oracle-release && RHEL_ver=9
+elif [ -e "/etc/redhat-release" ]; then
+  Family=rhel
+  Platform=RedHat
+  grep -Eqi "release 9." /etc/redhat-release && RHEL_ver=9
 else
   command -v lsb_release >/dev/null 2>&1 || { echo "${CFAILURE}${PM} source failed! ${CEND}"; kill -9 $$; exit 1; }
 fi

include/check_sw.sh

@@ -56,7 +56,19 @@ installDepsDebian() {
 
 installDepsRHEL() {
   [ -e '/etc/yum.conf' ] && sed -i 's@^exclude@#exclude@' /etc/yum.conf
-  if [ "${RHEL_ver}" == '8' ]; then
+  if [ "${RHEL_ver}" == '9' ]; then
+    if [[ "${Platform}" =~ "RedHat" ]]; then
+      subscription-manager repos --enable codeready-builder-for-rhel-9-${ARCH}-rpms
+      dnf -y install chrony oniguruma-devel rpcgen
+    elif [[ "${Platform}" =~ "Oracle" ]]; then
+      dnf config-manager --set-enabled ol9_codeready_builder
+      dnf -y install chrony oniguruma-devel rpcgen
+    else
+      dnf -y --enablerepo=crb install chrony oniguruma-devel rpcgen
+    fi
+    systemctl enable chronyd
+    systemctl stop firewalld && systemctl mask firewalld.service
+  elif [ "${RHEL_ver}" == '8' ]; then
     if [[ "${Platform}" =~ "RedHat" ]]; then
       subscription-manager repos --enable codeready-builder-for-rhel-8-${ARCH}-rpms
       dnf -y install chrony oniguruma-devel rpcgen
@@ -78,7 +90,6 @@ installDepsRHEL() {
     yum -y groupremove "Basic Web Server" "MySQL Database server" "MySQL Database client"
     systemctl stop firewalld && systemctl mask firewalld.service
   fi
-  [ "${RHEL_ver}" == '9' ] && dnf -y --enablerepo=crb install chrony oniguruma-devel rpcgen
 
   if [ ${RHEL_ver} -ge 7 >/dev/null 2>&1 ] && [ "${iptables_flag}" == 'y' ]; then
     yum -y install iptables-services
@@ -88,7 +99,7 @@ installDepsRHEL() {
 
   echo "${CMSG}Installing dependencies packages...${CEND}"
   # Install needed packages
-  pkgList="deltarpm drpm gcc gcc-c++ make cmake autoconf libjpeg libjpeg-devel libjpeg-turbo libjpeg-turbo-devel libpng libpng-devel libxml2 libxml2-devel zlib zlib-devel libzip libzip-devel glibc glibc-devel krb5-devel libc-client libc-client-devel glib2 glib2-devel bzip2 bzip2-devel ncurses ncurses-devel libaio numactl numactl-libs readline-devel curl curl-devel e2fsprogs e2fsprogs-devel krb5-devel libidn libidn-devel openssl openssl-devel net-tools libxslt-devel libicu-devel libevent-devel libtool libtool-ltdl bison gd-devel vim-enhanced pcre-devel libmcrypt libmcrypt-devel mhash mhash-devel mcrypt zip unzip chrony ntpdate sqlite-devel sysstat patch bc expect expat-devel perl-devel oniguruma oniguruma-devel libtirpc-devel nss libnsl rsync rsyslog git lsof lrzsz psmisc wget which libatomic tmux chkconfig"
+  pkgList="perl-FindBin deltarpm drpm gcc gcc-c++ make cmake autoconf libjpeg libjpeg-devel libjpeg-turbo libjpeg-turbo-devel libpng libpng-devel libxml2 libxml2-devel zlib zlib-devel libzip libzip-devel glibc glibc-devel krb5-devel libc-client libc-client-devel glib2 glib2-devel bzip2 bzip2-devel ncurses ncurses-devel libaio numactl numactl-libs readline-devel curl curl-devel e2fsprogs e2fsprogs-devel krb5-devel libidn libidn-devel openssl openssl-devel net-tools libxslt-devel libicu-devel libevent-devel libtool libtool-ltdl bison gd-devel vim-enhanced pcre-devel libmcrypt libmcrypt-devel mhash mhash-devel mcrypt zip unzip chrony ntpdate sqlite-devel sysstat patch bc expect expat-devel perl-devel oniguruma oniguruma-devel libtirpc-devel nss libnsl rsync rsyslog git lsof lrzsz psmisc wget which libatomic tmux chkconfig"
   for Package in ${pkgList}; do
     yum -y install ${Package}
   done