From 87eada103e47a71cf36a069e86a5955fd1550438 Mon Sep 17 00:00:00 2001 From: Fabian Arrotin Date: Jun 28 2014 20:31:35 +0000 Subject: Fixed anaconda file to check now that we have our own centos.py installclasses file on C7 --- diff --git a/tests/p_anaconda/anaconda_centos_patch.sh b/tests/p_anaconda/anaconda_centos_patch.sh index 06dc6c5..2e410aa 100755 --- a/tests/p_anaconda/anaconda_centos_patch.sh +++ b/tests/p_anaconda/anaconda_centos_patch.sh @@ -5,13 +5,15 @@ t_Log "Running $0 - CentOS Anaconda patch is applied test." if [ "$centos_ver" = "7" ];then ANACONDA_PATH=/usr/lib64/python2.7/site-packages/pyanaconda/ + ANACONDA_FILE="centos.py" else ANACONDA_PATH=/usr/lib/anaconda/ + ANACONDA_FILE="rhel.py" fi -(grep "id = \"centos\"" $ANACONDA_PATH/installclasses/rhel.py >/dev/null 2>&1) &&\ +(grep "id = \"centos\"" $ANACONDA_PATH/installclasses/$ANACONDA_FILE >/dev/null 2>&1) &&\ -(grep "name = N_(\"CentOS Linux\")" $ANACONDA_PATH/installclasses/rhel.py >/dev/null 2>&1) +(grep "name = N_(\"CentOS Linux\")" $ANACONDA_PATH/installclasses/$ANACONDA_FILE >/dev/null 2>&1) t_CheckExitStatus $?