[SCM] debian-live branch, master, updated. 1.0_a47-1-31-g2b77ec6

[Chris Lamb]

The following commit has been merged in the master branch:
commit 28db987a8e76567ced94b4f68461427bbb38e11d
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date:   Sun Jun 15 02:45:50 2008 +0100

    Abort if "live" d-i installation is attempted with minimal or stripped LH_PACKAGES_LISTS
    
    This is required because lh_binary_rootfs removes /boot if minimal or
    stripped is the only packages list.
    
    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 f4d02f6..d0f6d20 100755
--- a/helpers/lh_binary_debian-installer
+++ b/helpers/lh_binary_debian-installer
@@ -35,13 +35,22 @@ fi
 
 # Check d-i configuration
 case "${LH_DEBIAN_INSTALLER}" in
-	enabled|cdrom|netinst|netboot|businesscard|live)
+	enabled|cdrom|netinst|netboot|businesscard)
 		;;
 
 	disabled)
 		exit 0
 		;;
 
+	live)
+		case "${LH_PACKAGES_LISTS}" in
+			stripped|minimal)
+				Echo_error "live d-i installation is incompatbile with stripped and minimal"
+				exit 1
+			;;
+		esac
+		;;
+
 	*)
 		Echo_error "debian-installer flavour ${LH_DEBIAN_INSTALLER} not supported."
 		exit 1

-- 
debian-live