summaryrefslogtreecommitdiff
path: root/helpers/lh_config
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2008-10-28 16:26:17 +0100
committerDaniel Baumann <daniel@debian.org>2011-03-09 19:03:43 +0100
commit6696b019fe03a371d69c50a1ef82223e4bb364a7 (patch)
treeffeb45aa254e3fe140c0d13566322757f896be92 /helpers/lh_config
parentbd4b40a215a31bef1bfe364cdce16943efddc1d5 (diff)
downloadlive-build-6696b019fe03a371d69c50a1ef82223e4bb364a7.zip
live-build-6696b019fe03a371d69c50a1ef82223e4bb364a7.tar.gz
Renaming internal Read_conffile(); to Read_conffiles(); for consistency reasons.
Diffstat (limited to 'helpers/lh_config')
-rwxr-xr-xhelpers/lh_config6
1 files changed, 3 insertions, 3 deletions
diff --git a/helpers/lh_config b/helpers/lh_config
index 9b38c8a..513a2dc 100755
--- a/helpers/lh_config
+++ b/helpers/lh_config
@@ -728,17 +728,17 @@ Local_arguments ()
if [ -f "${SYSTEM_LH_CONFFILE}" ] && ! In_list "--ignore-system-defaults" "${@}"
then
Echo_message "Considering defaults defined in %s" "${SYSTEM_LH_CONFFILE}"
- Read_conffile "${SYSTEM_LH_CONFFILE}"
+ Read_conffiles "${SYSTEM_LH_CONFFILE}"
fi
# Reading existing configuration
-Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
+Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
Local_arguments "${@}"
if [ -n "${LH_CONFFILE}" ]
then
- Read_conffile "${LH_CONFFILE}"
+ Read_conffiles "${LH_CONFFILE}"
fi
# Setting defaults