From bfadf1da7d8f44a883b126d67ec0a3582db80342 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sat, 8 Dec 2012 15:45:10 -0500 Subject: relax the requirement that [[ $CHROOT != 'root' ]] --- src/lib/conf.sh | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/lib/conf.sh b/src/lib/conf.sh index 7693ee5..c5c5056 100644 --- a/src/lib/conf.sh +++ b/src/lib/conf.sh @@ -99,17 +99,12 @@ load_conf_libretools() { load_conf_libretools_chroot() { load_files chroot + # Exclude CHROOTEXTRAPKG from the checks because an empty value is valid if [[ -f /.arch-chroot ]]; then # check_vars chroot CHROOTEXTRAPKG : else # check_vars chroot CHROOTDIR CHROOT CHROOTEXTRAPKG - local ret=0 - check_vars chroot CHROOTDIR CHROOT || ret=$? - if [[ $CHROOT == root ]]; then - echo "Configured var CHROOT cannot equal 'root'" - ret=1 - fi - return $ret; + check_vars chroot CHROOTDIR CHROOT fi } -- cgit v1.2.2