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>
This commit is contained in:
parent
60c755e508
commit
4e18008ecb
|
@ -18,6 +18,7 @@ do
|
||||||
done
|
done
|
||||||
|
|
||||||
# Setting static variables
|
# Setting static variables
|
||||||
|
SYSTEM_LH_CONFFILE="/etc/live-helper"
|
||||||
DESCRIPTION="create configuration for live-helper(7)"
|
DESCRIPTION="create configuration for live-helper(7)"
|
||||||
HELP="FIXME"
|
HELP="FIXME"
|
||||||
USAGE="${PROGRAM} [--apt apt|aptitude]\n\
|
USAGE="${PROGRAM} [--apt apt|aptitude]\n\
|
||||||
|
@ -660,6 +661,12 @@ 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}"
|
||||||
|
|
|
@ -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.
|
environment variable. Environment variables are name LH_FOO, means, e.g.
|
||||||
\-\-apt\-ftp\-proxy becomes LH_APT_FTP_PROXY.
|
\-\-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
|
.SH SEE ALSO
|
||||||
\fIlive\-helper\fR(7)
|
\fIlive\-helper\fR(7)
|
||||||
.PP
|
.PP
|
||||||
|
|
Loading…
Reference in New Issue