[SCM] live-helper branch, master, updated. 1.0.5-2-64-ged26dc5

[Daniel Baumann]

The following commit has been merged in the master branch:
commit ed26dc5fa4799f866832680c82cdaaccfa8fe5e4
Author: Cody A.W. Somerville <cody.somerville at canonical.com>
Date:   Fri Nov 13 09:27:00 2009 +0100

    Correcting LH_BOOTAPPEND_INSTALL default values.

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
 

-- 
live-helper