[SCM] live-helper branch, debian-next, updated. debian/2.0_a18-1-6-g6ca1539

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit 6ca15396d744c09f9e1c2550837c39f3be98d8be
Author: Daniel Baumann <daniel at debian.org>
Date:   Fri Jul 16 05:10:26 2010 +0200

    Updating defaults to also add try-usb parameter for cdrom-detect when building iso-hybrid images with included debian-installer.

diff --git a/functions/defaults.sh b/functions/defaults.sh
index c395af0..27517e7 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -901,7 +901,7 @@ Set_defaults ()
 	fi
 
 	case "${LH_BINARY_IMAGES}" in
-		usb*)
+		iso-hybrid|usb*)
 			# Try USB block devices for install media
 			if ! echo "${LH_BOOTAPPEND_INSTALL}" | grep -q try-usb
 			then

-- 
live-helper