[SCM] debian-live branch, master, updated. 1.0_a47-1-2-g4e18008

[Marco Amadori]

The following commit has been merged in the master branch:
commit 4e18008ecb95c93321f7bd08667864331b909a45
Author: Marco Amadori <marco.amadori at gmail.com>
Date:   Fri May 16 23:52:02 2008 +0200

    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 at gmail.com>

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}"
diff --git a/manpages/lh_config.en.1 b/manpages/lh_config.en.1
index d7dbef4..d7fd733 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

-- 
debian-live