[SCM] live-helper branch, debian-next, updated. debian/2.0_a7-1-11-g3a8f683

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit 3a8f68333f01cf1189d7dce5017e445467ecc5aa
Author: Daniel Baumann <daniel at debian.org>
Date:   Thu Feb 18 17:59:43 2010 +0100

    Adding iso-hybrid as a binary flavour, part 2.

diff --git a/functions/defaults.sh b/functions/defaults.sh
index dbd1d4e..7fc8567 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -669,8 +669,15 @@ Set_defaults ()
 	esac
 
 	# Setting image type
-	LH_BINARY_IMAGES="${LH_BINARY_IMAGES:-iso}"
-	LH_BINARY_ISO_HYRBID="${LH_BINARY_ISO_HYBRID:-false}"
+	case "${LH_DISTRIBUTION}" in
+		squeeze|sid)
+			LH_BINARY_IMAGES="${LH_BINARY_IMAGES:-iso-hybrid}"
+			;;
+
+		*)
+			LH_BINARY_IMAGES="${LH_BINARY_IMAGES:-iso}"
+			;;
+	esac
 
 	# Setting apt indices
 	if echo ${LH_PACKAGES_LISTS} | grep -qs -E "(stripped|minimal)\b"
diff --git a/helpers/binary_iso b/helpers/binary_iso
index 67391fb..1fcfd8f 100755
--- a/helpers/binary_iso
+++ b/helpers/binary_iso
@@ -24,7 +24,12 @@ Read_conffiles config/all config/common config/bootstrap config/chroot config/bi
 Set_defaults
 
 case "${LH_BINARY_IMAGES}" in
-	iso*)
+	iso)
+		IMAGE="binary.iso"
+		;;
+
+	iso-hybrid)
+		IMAGE="binary-hybrid.iso"
 		;;
 
 	*)
@@ -61,9 +66,9 @@ Restore_cache cache/packages_binary
 Install_package
 
 # Remove old iso image
-if [ -f binary.iso ]
+if [ -f ${IMAGE} ]
 then
-	rm -f binary.iso
+	rm -f ${IMAGE}
 fi
 
 # Handle genisoimage generic options
@@ -181,7 +186,7 @@ fi
 
 cat >> binary.sh << EOF
 
-genisoimage ${GENISOIMAGE_OPTIONS} -o binary.iso binary
+genisoimage ${GENISOIMAGE_OPTIONS} -o ${IMAGE} binary
 EOF
 
 if [ "${LH_BINARY_ISO_HYRBID}" = "true" ]
@@ -189,7 +194,7 @@ then
 
 cat >> binary.sh << EOF
 
-isohybrid binary.iso
+isohybrid ${IMAGE}
 EOF
 
 fi
@@ -203,7 +208,7 @@ case "${LH_CHROOT_BUILD}" in
 		Chroot chroot "sh binary.sh"
 
 		# Move image
-		mv chroot/binary chroot/binary.iso ./
+		mv chroot/binary chroot/${IMAGE} ./
 		rm -f chroot/binary.sh
 		;;
 
diff --git a/helpers/clean b/helpers/clean
index 8f74209..0596e39 100755
--- a/helpers/clean
+++ b/helpers/clean
@@ -90,7 +90,7 @@ do
 		--binary)
 			${LH_ROOT_COMMAND} umount -f binary.tmp > /dev/null 2>&1 || true
 			rm -rf binary.tmp binary.deb binary.udeb
-			rm -f binary.iso
+			rm -f binary*.iso
 			rm -f binary*.img
 			rm -f binary*.tar.gz
 			rm -f binary.sh
@@ -122,7 +122,7 @@ do
 			;;
 
 		--source)
-			rm -f source.iso
+			rm -f source*.iso
 			rm -f source*.img
 			rm -f source*.tar
 			rm -f source*.tar.gz

-- 
live-helper