From 87807f5e6fe77d796b48e239b517f6e28e9ccf8d Mon Sep 17 00:00:00 2001 From: Fabian Arrotin Date: Jun 28 2014 20:51:37 +0000 Subject: Fixed the /etc/issue test as EL7 doesn't contain product name but '\S' --- diff --git a/tests/p_centos-release/centos-release_issue.sh b/tests/p_centos-release/centos-release_issue.sh index 90dea46..02c2ce3 100755 --- a/tests/p_centos-release/centos-release_issue.sh +++ b/tests/p_centos-release/centos-release_issue.sh @@ -2,8 +2,11 @@ # Author: Athmane Madjoudj t_Log "Running $0 - /etc/issue* has correct branding" - -(grep "CentOS" /etc/issue >/dev/null 2>&1) && \ -(grep "CentOS" /etc/issue.net >/dev/null 2>&1) - -t_CheckExitStatus $? +if [ "$centos_ver" = "7" ] ; then + t_Log "CentOS $centos_ver -> SKIP" + exit 0 +else + (grep "CentOS" /etc/issue >/dev/null 2>&1) && \ + (grep "CentOS" /etc/issue.net >/dev/null 2>&1) + t_CheckExitStatus $? +fi