summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Shumaker <LukeShu@sbcglobal.net>2012-12-08 15:45:10 -0500
committerLuke Shumaker <LukeShu@sbcglobal.net>2012-12-09 14:20:48 -0500
commitbfadf1da7d8f44a883b126d67ec0a3582db80342 (patch)
treee898ed54fd9a2fac13b0456dd5f9f12639b50b38
parentdb3d3af8719706c80a791b0d875d308b021ee81b (diff)
relax the requirement that [[ $CHROOT != 'root' ]]
-rw-r--r--src/lib/conf.sh9
1 files 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
}