[SCM] debian-live branch, master, updated. 1.0_a47-1-19-g2505291

[Chris Lamb]

The following commit has been merged in the master branch:
commit 6ada2b7bd46155b3a8325d35fe40ca24b0f5ead7
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date:   Sat Jun 14 17:22:57 2008 +0100

    Set correct d-i image type on usb-hdd and tar image types
    
    Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>

diff --git a/helpers/lh_binary_debian-installer b/helpers/lh_binary_debian-installer
index 4c4c2b8..3e2bdcc 100755
--- a/helpers/lh_binary_debian-installer
+++ b/helpers/lh_binary_debian-installer
@@ -92,18 +92,19 @@ case "${LH_BINARY_IMAGES}" in
 		;;
 esac
 
-# Setting remote d-i directories
-case "${LH_BINARY_IMAGES}" in
-	net)
+# Set d-i image type
+case "${LH_DEBIAN_INSTALLER}" in
+	businesscard|netboot|netinst)
 		DI_IMAGE_TYPE="netboot"
 		;;
 	*)
-		case "${LH_DEBIAN_INSTALLER}" in
-			businesscard|netboot)
-				DI_IMAGE_TYPE="netboot"
+		case "${LH_BINARY_IMAGES}" in
+			iso)
+				DI_IMAGE_TYPE="cdrom"
 				;;
+
 			*)
-				DI_IMAGE_TYPE="cdrom"
+				DI_IMAGE_TYPE="netboot"
 				;;
 		esac
 		;;

-- 
debian-live