[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[PATCH] Correct the LH_BOOTAPPEND_INSTALL default



Hello,

 Please accept the attached patch which will ensure LH_BOOTAPPEND_INSTALL is always set correctly and thus enable images to successfully boot even if you set LH_BOOTAPPEND_INSTALL yourself. The current behavior is to only modify LH_BOOTAPPEND_INSTALL if LH_BOOTAPPEND_INSTALL is empty. This means that if you *do* set LH_BOOTAPPEND_INSTALL, live-helper will no longer automatically add, for example, 'cdrom-detect/try-usb=true' to LH_BOOTAPPEND_INSTALL which is required to boot d-i from usb thumb drive. Whats currently required is to figure out what you need that live-helper was adding for you and add it yourself to LH_BOOTAPPEND_INSTALL in config/binary. It would be much more convenient if live-helper always automatically took care of this by always appending LH_BOOTAPPEND_INSTALL as necessary.

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
--- a/functions/defaults.sh	2009-11-08 09:50:53.376904897 -0500
+++ b/functions/defaults.sh	2009-11-12 00:44:05.815595886 -0500
@@ -326,6 +326,7 @@

@@ -824,22 +850,21 @@
 		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
-
-		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: