[SCM] debian-live branch, master, updated. 1.0_a47-1-69-ge0160b3

[Chris Lamb]

The following commit has been merged in the master branch:
commit 9f96103510214b834acf27408acef44f418c145f
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date:   Wed Jul 9 04:59:23 2008 +0100

    Fix bug where command-line argument --ignore-system-default was not seen before it was required.
    
    Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>

diff --git a/helpers/lh_config b/helpers/lh_config
index 5cbaa59..d4a1009 100755
--- a/helpers/lh_config
+++ b/helpers/lh_config
@@ -622,7 +622,6 @@ Local_arguments ()
 				;;
 
 			--ignore-system-defaults)
-				_LH_IGNORE_SYSTEM_DEFAULTS="enabled"
 				shift
 				;;
 
@@ -660,7 +659,7 @@ Local_arguments ()
 }
 
 # Reading system configuration
-if [ -f "${SYSTEM_LH_CONFFILE}" ] && [ "${_LH_IGNORE_SYSTEM_DEFAULTS}" != "enabled" ]
+if [ -f "${SYSTEM_LH_CONFFILE}" ] && if ! In_list "--ignore-system-defaults" "${@}"
 then
 	Echo_message "Using system defaults from ${SYSTEM_LH_CONFFILE}"
 	Read_conffile "${SYSTEM_LH_CONFFILE}"

-- 
debian-live