manuel
/
live-build
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix bug where command-line argument --ignore-system-default was not seen before it was required. 

Signed-off-by: Chris Lamb <chris@chris-lamb.co.uk>
This commit is contained in:
Chris Lamb 2008-07-09 04:59:23 +01:00
parent 0b38353a81
commit 9f96103510
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
helpers/lh_config
View File

@ -622,7 +622,6 @@ Local_arguments ()
;; ;;
--ignore-system-defaults) --ignore-system-defaults)
_LH_IGNORE_SYSTEM_DEFAULTS="enabled"
shift shift
;; ;;
@ -660,7 +659,7 @@ Local_arguments ()
} }
# Reading system configuration # 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 then
Echo_message "Using system defaults from ${SYSTEM_LH_CONFFILE}" Echo_message "Using system defaults from ${SYSTEM_LH_CONFFILE}"
Read_conffile "${SYSTEM_LH_CONFFILE}" Read_conffile "${SYSTEM_LH_CONFFILE}"