[SCM] debian-live branch, master, updated. 1.0_a47-1-43-g30bafda

[Chris Lamb]

The following commit has been merged in the master branch:
commit 30bafdae5792670fea6f3f6f68e7e894d266483f
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date:   Thu Jun 19 19:03:10 2008 +0100

    Revert aborting live d-i installation if minimal/stripped is selected and instead attempt to not break the chroot too much in this case
    
    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 3a16a19..ee437ab 100755
--- a/helpers/lh_binary_debian-installer
+++ b/helpers/lh_binary_debian-installer
@@ -35,22 +35,13 @@ fi
 
 # Check d-i configuration
 case "${LH_DEBIAN_INSTALLER}" in
-	enabled|cdrom|netinst|netboot|businesscard)
+	enabled|cdrom|netinst|netboot|businesscard|live)
 		;;
 
 	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
diff --git a/helpers/lh_binary_iso b/helpers/lh_binary_iso
index 7d762af..32d4148 100755
--- a/helpers/lh_binary_iso
+++ b/helpers/lh_binary_iso
@@ -124,11 +124,14 @@ case "${LH_BOOTLOADER}" in
 		;;
 esac
 
-case "${LH_PACKAGES_LISTS}" in
-	stripped|minimal)
-		GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -m ${GENISOIMAGE_EXCLUDE}"
-		;;
-esac
+if [ "${LH_DEBIAN_INSTALLER}" != "live" ]
+then
+	case "${LH_PACKAGES_LISTS}" in
+		stripped|minimal)
+			GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -m ${GENISOIMAGE_EXCLUDE}"
+			;;
+	esac
+fi
 
 cat > binary.sh << EOF
 genisoimage ${GENISOIMAGE_OPTIONS} -o binary.iso -J -l -cache-inodes -allow-multidot binary
diff --git a/helpers/lh_binary_rootfs b/helpers/lh_binary_rootfs
index abd26ac..c17660d 100755
--- a/helpers/lh_binary_rootfs
+++ b/helpers/lh_binary_rootfs
@@ -223,11 +223,14 @@ case "${LH_CHROOT_FILESYSTEM}" in
 			MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -info"
 		fi
 
-		case "${LH_PACKAGES_LISTS}" in
-			stripped|minimal)
-				MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -e $(ls chroot/boot/${LINUX}* chroot/boot/initrd.img* chroot/${LINUX}* chroot/initrd.img* | sed 's|chroot/||g')"
-				;;
-		esac
+		if [ "${LH_DEBIAN_INSTALLER}" != "live" ]
+		then
+			case "${LH_PACKAGES_LISTS}" in
+				stripped|minimal)
+					MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -e $(ls chroot/boot/${LINUX}* chroot/boot/initrd.img* chroot/${LINUX}* chroot/initrd.img* | sed 's|chroot/||g')"
+					;;
+			esac
+		fi
 
 		if [ -f config/binary_rootfs/squashfs.sort ]
 		then

-- 
debian-live