diff options
| author | Marco Amadori <marco.amadori@gmail.com> | 2008-05-16 23:52:02 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 19:03:34 +0100 |
| commit | 80a2f25b028c28c14ed800c5c63734fa605bbfba (patch) | |
| tree | 95157b36af4fb7779238262c4bef2f02bf315d89 /helpers | |
| parent | 2b287d6b6cc834a6e326a73752e53e09c1dea2b5 (diff) | |
| download | live-build-80a2f25b028c28c14ed800c5c63734fa605bbfba.zip live-build-80a2f25b028c28c14ed800c5c63734fa605bbfba.tar.gz | |
Added support for /etc/live-helper.
* lh_config system-wide configuration file, like an implicit specification
of '--conffile=/etc/live-helper' to each lh_config call.
Diffstat (limited to 'helpers')
| -rwxr-xr-x | helpers/lh_config | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/helpers/lh_config b/helpers/lh_config index 85d3134..6fa2ad6 100755 --- a/helpers/lh_config +++ b/helpers/lh_config @@ -18,6 +18,7 @@ do done # Setting static variables +SYSTEM_LH_CONFFILE="/etc/live-helper" DESCRIPTION="create configuration for live-helper(7)" HELP="FIXME" USAGE="${PROGRAM} [--apt apt|aptitude]\n\ @@ -660,6 +661,12 @@ Local_arguments "${@}" # Setting 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}" ] then Read_conffile "${LH_CONFFILE}" |