From 2a3685416c319a1c6b5a39a86de7ff313cbdcebd Mon Sep 17 00:00:00 2001 From: Fabian Arrotin Date: Jul 27 2019 16:11:13 +0000 Subject: Fixed p_setup test for c8 Signed-off-by: Fabian Arrotin --- diff --git a/tests/p_setup/group_file_test.sh b/tests/p_setup/group_file_test.sh index 4bb9f53..cd9ad4f 100755 --- a/tests/p_setup/group_file_test.sh +++ b/tests/p_setup/group_file_test.sh @@ -3,10 +3,16 @@ t_Log "Running $0 - group file sanity check." +if [ "$centos_ver" -eq "8" ] ;then + nobody_grpid="65534" +else + nobody_grpid="99" +fi + grep -q 'root:x:0' /etc/group && \ grep -q 'bin:x:1' /etc/group && \ grep -q 'daemon:x:2' /etc/group && \ -grep -q 'nobody:x:99' /etc/group +grep -q "nobody:x:${nobody_grpid}" /etc/group t_CheckExitStatus $? diff --git a/tests/p_setup/passwd_file_test.sh b/tests/p_setup/passwd_file_test.sh index df21a16..7a35c28 100755 --- a/tests/p_setup/passwd_file_test.sh +++ b/tests/p_setup/passwd_file_test.sh @@ -3,8 +3,14 @@ t_Log "Running $0 - passwd file sanity check." +if [ "$centos_ver" -eq "8" ] ;then + nobody_grpid="65534" +else + nobody_grpid="99" +fi + grep -q 'root:x:0' /etc/passwd && \ -grep -q 'nobody:x:99' /etc/passwd +grep -q "nobody:x:${nobody_grpid}" /etc/passwd t_CheckExitStatus $?