diff options
| author | Marco Amadori <marco.amadori@gmail.com> | 2008-05-16 23:52:02 +0200 |
|---|---|---|
| committer | Marco Amadori <amadorim@vdavda.com> | 2008-06-09 08:52:45 +0200 |
| commit | 4e18008ecb95c93321f7bd08667864331b909a45 (patch) | |
| tree | 95157b36af4fb7779238262c4bef2f02bf315d89 | |
| parent | 60c755e5089a8ac0c425f1f345ed39984eb4037b (diff) | |
| download | vyos-live-build-4e18008ecb95c93321f7bd08667864331b909a45.tar.gz vyos-live-build-4e18008ecb95c93321f7bd08667864331b909a45.zip | |
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.
Signed-off-by: Marco Amadori <marco.amadori@gmail.com>
| -rwxr-xr-x | helpers/lh_config | 7 | ||||
| -rw-r--r-- | manpages/lh_config.en.1 | 6 |
2 files changed, 13 insertions, 0 deletions
diff --git a/helpers/lh_config b/helpers/lh_config index 85d313430..6fa2ad6f7 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}" diff --git a/manpages/lh_config.en.1 b/manpages/lh_config.en.1 index d7dbef4fb..d7fd73392 100644 --- a/manpages/lh_config.en.1 +++ b/manpages/lh_config.en.1 @@ -278,6 +278,12 @@ All command line switches can also be specified through the corresponding environment variable. Environment variables are name LH_FOO, means, e.g. \-\-apt\-ftp\-proxy becomes LH_APT_FTP_PROXY. +.SH FILES +.I /etc/live-helper +.PP +An optional conffile for lh_config defaults, useful to specify a few system wide defaults, like +LH_MIRROR_BOOTSTRAP. + .SH SEE ALSO \fIlive\-helper\fR(7) .PP |