diff options
| author | Chris Lamb <chris@chris-lamb.co.uk> | 2008-08-16 11:30:48 +0100 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 19:03:40 +0100 |
| commit | 59e0b310a3fd3555c919baca7ef3a24a1973f5e7 (patch) | |
| tree | d0be69911927c0f3af9a2c38fd042243150321a6 /functions | |
| parent | 3ef56108907e1e353410103267fbfa475dd131d1 (diff) | |
| download | live-build-59e0b310a3fd3555c919baca7ef3a24a1973f5e7.zip live-build-59e0b310a3fd3555c919baca7ef3a24a1973f5e7.tar.gz | |
Correct logic in LH_BOOTAPPEND_INSTALL handling
(LH_BOOTAPPEND_INSTALL was being overridden if a preseed.cfg was found.)
Diffstat (limited to 'functions')
| -rwxr-xr-x | functions/defaults.sh | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/functions/defaults.sh b/functions/defaults.sh index a2db35d..3a3b423 100755 --- a/functions/defaults.sh +++ b/functions/defaults.sh @@ -578,11 +578,14 @@ Set_defaults () esac fi - if [ -z "${LH_BOOTAPPEND_INSTALL}" ] && [ -n ${_LH_BOOTAPPEND_PRESEED} ] + if [ -z "${LH_BOOTAPPEND_INSTALL}" ] then - LH_BOOTAPPEND_INSTALL="${_LH_BOOTAPPEND_PRESEED} -- \${LH_BOOTAPPEND_LIVE}" - else - LH_BOOTAPPEND_INSTALL=" -- \${LH_BOOTAPPEND_LIVE}" + if [ -n ${_LH_BOOTAPPEND_PRESEED} ] + then + LH_BOOTAPPEND_INSTALL="${_LH_BOOTAPPEND_PRESEED} -- \${LH_BOOTAPPEND_LIVE}" + else + LH_BOOTAPPEND_INSTALL=" -- \${LH_BOOTAPPEND_LIVE}" + fi fi # Setting encryption |