From d9aef7b4ac25b171c60fcfbebf83816d1ec70530 Mon Sep 17 00:00:00 2001 From: Cloud User Date: Tue, 17 Mar 2015 19:38:07 -0400 Subject: [PATCH] Updated get_distro.sh for RHEL 7 --- ChangeLog | 2 ++ get_distro.sh | 9 +++++++++ 2 files changed, 11 insertions(+) diff --git a/ChangeLog b/ChangeLog index e7635311..107b23a8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -14837,3 +14837,5 @@ 2015-03-16 Fred Gleason * Added 'DESCRIPTION', 'OUTCUE', 'FILENAME' and '*_POINT' fields to the 'Cart CSV Report' in 'rdlibrary/list_reports.cpp'. +2015-03-17 Fred Gleason + * Updated 'get_distro.sh' to detect RHEL 7 correctly. diff --git a/get_distro.sh b/get_distro.sh index fd15e45a..9ecbe2e6 100755 --- a/get_distro.sh +++ b/get_distro.sh @@ -58,6 +58,9 @@ case "$1" in if test $VER = "release" ; then VER=`awk '/release/ {print $4}' /etc/redhat-release` fi + if test $VER = "Enterprise" ; then + VER=`awk '/release/ {print $7}' /etc/redhat-release` + fi echo $VER exit 0 fi @@ -80,6 +83,9 @@ case "$1" in if test $VER = "release" ; then VER=`awk '/release/ {print $4}' /etc/redhat-release` fi + if test $VER = "Enterprise" ; then + VER=`awk '/release/ {print $7}' /etc/redhat-release` + fi echo $VER | awk -F '.' '{print $1}' exit 0 fi @@ -98,6 +104,9 @@ case "$1" in if test $VER = "release" ; then VER=`awk '/release/ {print $4}' /etc/redhat-release` fi + if test $VER = "Enterprise" ; then + VER=`awk '/release/ {print $7}' /etc/redhat-release` + fi echo $VER | awk -F '.' '{print $2}' exit 0 fi