From e009736e40681a61a531b89661598a37d4597a0b Mon Sep 17 00:00:00 2001 From: Fabian Arrotin Date: May 19 2014 13:45:12 +0000 Subject: Fixed initscripts checks for el7 (a specific test for el5 had to be excluded) , also systemctl output is different now --- diff --git a/tests/p_initscripts/initscripts_centos_brand_rcsysinit.sh b/tests/p_initscripts/initscripts_centos_brand_rcsysinit.sh index 090a7b1..8b13d35 100755 --- a/tests/p_initscripts/initscripts_centos_brand_rcsysinit.sh +++ b/tests/p_initscripts/initscripts_centos_brand_rcsysinit.sh @@ -3,12 +3,11 @@ t_Log "Running $0 - initscripts CentOS branding " -if (t_GetPkgRel basesystem | grep -q el6) -then - t_Log "Test not required for CentOS 6.x" - exit 0 +if [ "$centos_ver" -gt "5" ] ; then + t_Log "Test not required for CentOS $centos_ver -> SKIP" + exit 0 else - grep "CentOS" /etc/rc.sysinit > /dev/null 2>&1 + grep "CentOS" /etc/rc.sysinit > /dev/null 2>&1 fi t_CheckExitStatus $? diff --git a/tests/p_initscripts/initscripts_service_status.sh b/tests/p_initscripts/initscripts_service_status.sh index 2c7c382..58bbdd4 100755 --- a/tests/p_initscripts/initscripts_service_status.sh +++ b/tests/p_initscripts/initscripts_service_status.sh @@ -4,7 +4,7 @@ t_Log "Running $0 - check if service cmd can get service status" # auditd is used as example because it's standard with minimal install -service auditd status | grep -q 'is running' +service auditd status t_CheckExitStatus $?