[SCM] live-helper branch, debian-next, updated. debian/2.0_a6-1-12-g9f66329

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit 9f663297d6632184232c6ea87bbeb7ec3a5d0627
Author: Daniel Baumann <daniel at debian.org>
Date:   Wed Feb 17 12:18:34 2010 +0100

    Don't append and re-append try-usb parameter to bootappend-install options over and over again.

diff --git a/functions/defaults.sh b/functions/defaults.sh
index f52578f..03b1554 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -782,7 +782,10 @@ Set_defaults ()
 	if [ "${LH_BINARY_IMAGES}" = "usb-hdd" ]
 	then
 		# Try USB block devices for install media
-		LH_BOOTAPPEND_INSTALL="cdrom-detect/try-usb=true ${LH_BOOTAPPEND_INSTALL}"
+		if ! echo "${LH_BOOTAPPEND_INSTALL}" | grep -q try-usb
+		then
+			LH_BOOTAPPEND_INSTALL="cdrom-detect/try-usb=true ${LH_BOOTAPPEND_INSTALL}"
+		fi
 	fi
 
 	if [ -n ${_LH_BOOTAPPEND_PRESEED} ]

-- 
live-helper