diff options
| author | Cody A.W. Somerville <cody.somerville@canonical.com> | 2009-11-13 09:27:00 +0100 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 19:09:48 +0100 |
| commit | 7b3038c64f3236fea7e4940f4e4aa76e2bbdb97f (patch) | |
| tree | b4f6f5a74aec7a98c27e6b1e12a0ad4e9977be3e | |
| parent | 605af5262385ef9743066562b1682b888a6cb00b (diff) | |
| download | live-build-7b3038c64f3236fea7e4940f4e4aa76e2bbdb97f.zip live-build-7b3038c64f3236fea7e4940f4e4aa76e2bbdb97f.tar.gz | |
Correcting LH_BOOTAPPEND_INSTALL default values.
| -rwxr-xr-x | functions/defaults.sh | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/functions/defaults.sh b/functions/defaults.sh index f2a6de2..399c582 100755 --- a/functions/defaults.sh +++ b/functions/defaults.sh @@ -824,19 +824,19 @@ Set_defaults () esac fi - if [ -z "${LH_BOOTAPPEND_INSTALL}" ] + if [ "${LH_BINARY_IMAGES}" = "usb-hdd" ] then # Try USB block devices for install media - if [ "${LH_BINARY_IMAGES}" = "usb-hdd" ] - then - LH_BOOTAPPEND_INSTALL="cdrom-detect/try-usb=true" - fi + LH_BOOTAPPEND_INSTALL="cdrom-detect/try-usb=true ${LH_BOOTAPPEND_INSTALL}" + fi - if [ -n ${_LH_BOOTAPPEND_PRESEED} ] - then - LH_BOOTAPPEND_INSTALL="${LH_BOOTAPPEND_INSTALL} ${_LH_BOOTAPPEND_PRESEED}" - fi + if [ -n ${_LH_BOOTAPPEND_PRESEED} ] + then + LH_BOOTAPPEND_INSTALL="${LH_BOOTAPPEND_INSTALL} ${_LH_BOOTAPPEND_PRESEED}" + fi + if [ -n "${LH_BOOTAPPEND_LIVE}" ] + then LH_BOOTAPPEND_INSTALL="${LH_BOOTAPPEND_INSTALL} -- \${LH_BOOTAPPEND_LIVE}" fi |