diff options
| author | Daniel Baumann <daniel@debian.org> | 2008-04-07 12:01:37 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 19:03:31 +0100 |
| commit | 705a4178e75ffc190acf2fa914a6cd1519fdae87 (patch) | |
| tree | bd7e2000588e9684937c1260dd950ea4710b2c36 /functions/conffile.sh | |
| parent | c6b83b1fd3fb807338b954bb4793f4e43fb45847 (diff) | |
| download | vyos-live-build-705a4178e75ffc190acf2fa914a6cd1519fdae87.tar.gz vyos-live-build-705a4178e75ffc190acf2fa914a6cd1519fdae87.zip | |
Centraly evaluate LH_CONFIG for custom configuration file.
Diffstat (limited to 'functions/conffile.sh')
| -rwxr-xr-x | functions/conffile.sh | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/functions/conffile.sh b/functions/conffile.sh index e36584a7e..17121b8c0 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 |