summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2008-11-02 17:22:56 +0100
committerDaniel Baumann <daniel@debian.org>2011-03-09 19:03:44 +0100
commit22a06c656686d64a8624b3c07210583c3f764cbe (patch)
treec6a43cbd613197cb8bc828796bb7e62acfc714f6
parent2b5f0a7a071fbc50d82246194bce2ab118f114a0 (diff)
downloadlive-build-22a06c656686d64a8624b3c07210583c3f764cbe.zip
live-build-22a06c656686d64a8624b3c07210583c3f764cbe.tar.gz
Generalizing internal LH_CONFFILE variable.
-rwxr-xr-xfunctions/arguments.sh2
-rwxr-xr-xhelpers/lh_config6
2 files changed, 4 insertions, 4 deletions
diff --git a/functions/arguments.sh b/functions/arguments.sh
index 70f397c..a360e82 100755
--- a/functions/arguments.sh
+++ b/functions/arguments.sh
@@ -28,7 +28,7 @@ Arguments ()
;;
-c|--conffile)
- LH_CONFFILE="${2}"
+ _CONFFILE="${2}"
shift 2
;;
diff --git a/helpers/lh_config b/helpers/lh_config
index 557f2bf..1a9c615 100755
--- a/helpers/lh_config
+++ b/helpers/lh_config
@@ -643,7 +643,7 @@ Local_arguments ()
;;
-c|--conffile)
- LH_CONFFILE="${2}"
+ _CONFFILE="${2}"
shift 2
;;
@@ -716,9 +716,9 @@ Read_conffiles config/all config/common config/bootstrap config/chroot config/bi
Local_arguments "${@}"
-if [ -n "${LH_CONFFILE}" ]
+if [ -n "${_CONFFILE}" ]
then
- Read_conffiles "${LH_CONFFILE}"
+ Read_conffiles "${_CONFFILE}"
fi
# Setting defaults