[SCM] debian-live/live-helper branch, master, updated. 1.0_a41-1-9-g07a3c54

[Daniel Baumann]

The following commit has been merged in the master branch:
commit af3aebda730fb5752ffdcdd6afceb6cb64d05a6f
Author: Daniel Baumann <daniel at debian.org>
Date:   Mon Apr 7 12:01:37 2008 +0200

    Centraly evaluate LH_CONFIG for custom configuration file.

diff --git a/functions/conffile.sh b/functions/conffile.sh
index e36584a..17121b8 100755
--- a/functions/conffile.sh
+++ b/functions/conffile.sh
@@ -11,10 +11,15 @@ set -e
 
 Read_conffile ()
 {
-	FILES="${1} ${1}.${LH_ARCHITECTURE} ${1}.${DISTRIBUTION}"
-	FILES="${FILES} config/$(echo ${PROGRAM} | sed -e 's|^lh_||')"
-	FILES="${FILES} config/$(echo ${PROGRAM} | sed -e 's|^lh_||').${ARCHITECTURE}"
-	FILES="${FILES} config/$(echo ${PROGRAM} | sed -e 's|^lh_||').${DISTRIBUTION}"
+	if [ -n "${LH_CONFIG}" ]
+	then
+		FILES="${LH_CONFIG}"
+	else
+		FILES="${1} ${1}.${LH_ARCHITECTURE} ${1}.${DISTRIBUTION}"
+		FILES="${FILES} config/$(echo ${PROGRAM} | sed -e 's|^lh_||')"
+		FILES="${FILES} config/$(echo ${PROGRAM} | sed -e 's|^lh_||').${ARCHITECTURE}"
+		FILES="${FILES} config/$(echo ${PROGRAM} | sed -e 's|^lh_||').${DISTRIBUTION}"
+	fi
 
 	for FILE in ${FILES}
 	do

-- 
debian-live/live-helper