[PATCH] Yet another patch fixing LH_BOOTAPPEND_INSTALL
Hello,
It appears that I've been a little sloppy when it comes to LH_BOOTAPPEND_INSTALL in functions/defaults.sh; my sincerest apologizes. Please review the attached patch for acceptance to hopefully fix LH_BOOTAPPEND_INSTALL for good.
Cheers,
--
Cody A.W. Somerville
Software Systems Release Engineer
Foundations Team
Custom Engineering Solutions Group
Canonical OEM Services
Phone: +1-781-850-2087
Cell: +1-506-471-8402
Email: cody.somerville@canonical.com
diff --git a/functions/defaults.sh b/functions/defaults.sh
index 32cc7b5..a0a7076 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -759,6 +759,7 @@ Set_defaults ()
# Setting boot parameters
# LH_BOOTAPPEND_LIVE
+ # LH_BOOTAPEND_INSTALL
if [ -n "${LH_DEBIAN_INSTALLER_PRESEEDFILE}" ]
then
case "${LH_BINARY_IMAGES}" in
@@ -789,23 +790,23 @@ Set_defaults ()
esac
fi
- if [ -z "${LH_BOOTAPPEND_INSTALL}" ]
+ # 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
- # 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_INSTALL} ${_LH_BOOTAPPEND_PRESEED}"
- fi
+ LH_BOOTAPPEND_INSTALL="cdrom-detect/try-usb=true ${LH_BOOTAPPEND_INSTALL}"
+ fi
- LH_BOOTAPPEND_INSTALL="${LH_BOOTAPPEND_INSTALL} -- \${LH_BOOTAPPEND_LIVE}"
+ 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
+
# Setting encryption
LH_ENCRYPTION="${LH_ENCRYPTION:-disabled}"
Reply to: