[SCM] debian-live branch, master, updated. 1.0_a48-1-47-g12fae93

[Chris Lamb]

The following commit has been merged in the master branch:
commit 12fae93f2ba2b3fb353649a2bb30f00b03ecba83
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date:   Mon Aug 11 01:27:32 2008 +0100

    Choose correct d-i install method for "live" and usb-hdd/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 a66137f..e366d8c 100755
--- a/helpers/lh_binary_debian-installer
+++ b/helpers/lh_binary_debian-installer
@@ -106,12 +106,12 @@ case "${LH_DEBIAN_INSTALLER}" in
 		;;
 	*)
 		case "${LH_BINARY_IMAGES}" in
-			iso)
-				DI_IMAGE_TYPE="cdrom"
+			net)
+				DI_IMAGE_TYPE="netboot"
 				;;
 
 			*)
-				DI_IMAGE_TYPE="netboot"
+				DI_IMAGE_TYPE="cdrom"
 				;;
 		esac
 		;;

-- 
debian-live