diff --git a/ChangeLog b/ChangeLog index dee2d902..d20e2aee 100644 --- a/ChangeLog +++ b/ChangeLog @@ -14837,6 +14837,8 @@ 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. 2015-03-23 Fred Gleason * Fixed a fencepost bug in 'ripcd/sasusi.cpp' that caused the last relay in the list to fail to respond to a 'GO' RML. 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