From 7e639336329c1dfd67140186f2a435717a5bc5c4 Mon Sep 17 00:00:00 2001 From: Fabian Arrotin Date: May 19 2014 13:26:29 +0000 Subject: Fixed grub test for el7 (using grub2) --- diff --git a/tests/p_grub/grub_dir_layout_test.sh b/tests/p_grub/grub_dir_layout_test.sh index a4ba86c..f968d8a 100755 --- a/tests/p_grub/grub_dir_layout_test.sh +++ b/tests/p_grub/grub_dir_layout_test.sh @@ -5,6 +5,13 @@ t_Log "Running $0 - check that grub file layout is the same with upstream." +if [ "$centos_ver" = "7" ] ; then + t_Log "el7 comes with grub2, skipping grub test ..." + t_CheckExitStatus 0 + exit 0 +fi + + ARCH=`uname -m | sed 's/i6/i3/'` [[ $( ls /usr/share/grub/ | wc -l ) -eq 1 ]] && \