diff options
| author | Chris Lamb <chris@chris-lamb.co.uk> | 2008-08-16 11:30:48 +0100 |
|---|---|---|
| committer | Chris Lamb <chris@chris-lamb.co.uk> | 2008-08-16 11:30:48 +0100 |
| commit | e11175ed2c6e06272874e48a4534d2da085e707e (patch) | |
| tree | d25206be02e0bf5a1cd58a4426f2fd1d8ccfcfa7 | |
| parent | 0a5065a817e5be289354400490cbe054ea3778ed (diff) | |
| download | vyos-live-build-e11175ed2c6e06272874e48a4534d2da085e707e.tar.gz vyos-live-build-e11175ed2c6e06272874e48a4534d2da085e707e.zip | |
Correct logic in LH_BOOTAPPEND_INSTALL handling
(LH_BOOTAPPEND_INSTALL was being overridden if a preseed.cfg was found.)
| -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 a2db35d9b..3a3b4237c 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 |