From 7b3038c64f3236fea7e4940f4e4aa76e2bbdb97f Mon Sep 17 00:00:00 2001
From: "Cody A.W. Somerville" <cody.somerville@canonical.com>
Date: Fri, 13 Nov 2009 09:27:00 +0100
Subject: Correcting LH_BOOTAPPEND_INSTALL default values.

---
 functions/defaults.sh | 18 +++++++++---------
 1 file 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
 
-- 
cgit v1.0