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

Correcting order where system-wide lh_config defaults file is read, thanks to Juergen Fiedler <juergen.fiedler@gmail.com>.

This commit is contained in:
Daniel Baumann 2008-06-10 19:04:23 +02:00
parent d59d511813
commit 0c15f64d5b
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
helpers/lh_config
View File

@ -653,6 +653,13 @@ Local_arguments ()
done done
} }
# Reading system configuration
if [ -f "${SYSTEM_LH_CONFFILE}" ]
then
Echo_verbose "Using system defaults from ${SYSTEM_LH_CONFFILE}"
Read_conffile "${SYSTEM_LH_CONFFILE}"
fi
# Reading existing configuration # Reading existing configuration
Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
@ -661,12 +668,6 @@ Local_arguments "${@}"
# Setting defaults # Setting defaults
Set_defaults Set_defaults
if [ -f "${SYSTEM_LH_CONFFILE}" ]
then
Echo_verbose "Using system defaults from ${SYSTEM_LH_CONFFILE}"
Read_conffile "${SYSTEM_LH_CONFFILE}"
fi
if [ -n "${LH_CONFFILE}" ] if [ -n "${LH_CONFFILE}" ]
then then
Read_conffile "${LH_CONFFILE}" Read_conffile "${LH_CONFFILE}"