diff options
| author | Cody A.W. Somerville <cody.somerville@canonical.com> | 2009-05-27 18:08:35 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 19:09:44 +0100 |
| commit | 0fef6abce818a9ce2bf91693544a275395060817 (patch) | |
| tree | cd32f72b985a66721e696a5af5c5a0ce9222a395 /functions | |
| parent | cfc81e5622459e052d132e41bd0b7a06861c25e4 (diff) | |
| download | live-build-0fef6abce818a9ce2bf91693544a275395060817.zip live-build-0fef6abce818a9ce2bf91693544a275395060817.tar.gz | |
Fixing LH_BOOTAPPEND_INSTALL issues for Ubuntu based builds.
Diffstat (limited to 'functions')
| -rwxr-xr-x | functions/defaults.sh | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/functions/defaults.sh b/functions/defaults.sh index c87811c..32cc7b5 100755 --- a/functions/defaults.sh +++ b/functions/defaults.sh @@ -767,7 +767,12 @@ Set_defaults () ;; usb-hdd) - _LH_BOOTAPPEND_PRESEED="file=/hd-media/install/${LH_DEBIAN_INSTALLER_PRESEEDFILE}" + if [ "${LH_MODE}" = "ubuntu" ] + then + _LH_BOOTAPPEND_PRESEED="file=/cdrom/install/${LH_DEBIAN_INSTALLER_PRESEEDFILE}" + else + _LH_BOOTAPPEND_PRESEED="file=/hd-media/install/${LH_DEBIAN_INSTALLER_PRESEEDFILE}" + fi ;; net) @@ -786,19 +791,19 @@ Set_defaults () if [ -z "${LH_BOOTAPPEND_INSTALL}" ] then + # Ubuntu's d-i is patched to be able to use usb-hdd block devices for + # install media if enabled by preseeding cdrom-detect/try-usb to true. + if [ "${LH_MODE}" = "ubuntu" ] && [ "${LH_BINARY_IMAGES}" = "usb-hdd" ] + then + LH_BOOTAPPEND_INSTALL="cdrom-detect/try-usb=true" + fi + if [ -n ${_LH_BOOTAPPEND_PRESEED} ] then - LH_BOOTAPPEND_INSTALL="${_LH_BOOTAPPEND_PRESEED} -- \${LH_BOOTAPPEND_LIVE}" - else - LH_BOOTAPPEND_INSTALL=" -- \${LH_BOOTAPPEND_LIVE}" + LH_BOOTAPPEND_INSTALL="${LH_BOOTAPPEND_INSTALL} ${_LH_BOOTAPPEND_PRESEED}" fi - fi - # Ubuntu's d-i is patched to be able to use usb-hdd block devices for - # install media if enabled by preseeding cdrom-detect/try-usb to true. - if [ "${LH_MODE}" = "ubuntu" ] && [ "${LH_BINARY_IMAGES}" = "usb-hdd" ] - then - LH_BOOTAPPEND_INSTALL="cdrom-detect/try-usb=true -- \${LH_BOOTAPPEND_LIVE}" + LH_BOOTAPPEND_INSTALL="${LH_BOOTAPPEND_INSTALL} -- \${LH_BOOTAPPEND_LIVE}" fi # Setting encryption |