[SCM] Debian Live build scripts branch, master, updated. 1.0.1-1-76-g4de79b6

Daniel Baumann daniel at debian.org
Mon Nov 3 11:16:03 UTC 2008


The following commit has been merged in the master branch:
commit 4de79b688794361a5022bdc5f7bc24e975b77e2b
Author: Daniel Baumann <daniel at debian.org>
Date:   Sun Nov 2 17:22:56 2008 +0100

    Generalizing internal LH_CONFFILE variable.

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

-- 
Debian Live build scripts



More information about the debian-live-changes mailing list