From c66942f06ed5dcebab29711afee6dcef8d865adf Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel@debian.org>
Date: Thu, 18 Feb 2010 17:34:29 +0100
Subject: Reworking iso-hybrid as an independent binary image type.

---
 functions/architecture.sh | 43 ++++++++++++++++++++++---------------------
 functions/defaults.sh     | 21 ++++++++++++++++++---
 2 files changed, 40 insertions(+), 24 deletions(-)

(limited to 'functions')

diff --git a/functions/architecture.sh b/functions/architecture.sh
index cd8e073a8..9f18ad47e 100755
--- a/functions/architecture.sh
+++ b/functions/architecture.sh
@@ -59,28 +59,29 @@ Check_multiarchitecture ()
 	if [ "$(echo ${LH_ARCHITECTURE} | wc -w)" -gt "1" ]
 	then
 		# First, only support multiarch on iso
-		if [ "${LH_BINARY_IMAGES}" = "iso" ]
-		then
-			# Assemble multi-arch
-			case "${LH_CURRENT_ARCHITECTURE}" in
-				amd64)
-					DESTDIR="${DESTDIR}.amd"
-					DESTDIR_LIVE="${DESTDIR_LIVE}.amd"
-					DESTDIR_INSTALL="${DESTDIR_INSTALL}.amd"
-					;;
+		case "${LH_BINARY_IMAGES}" in
+			iso*)
+				# Assemble multi-arch
+				case "${LH_CURRENT_ARCHITECTURE}" in
+					amd64)
+						DESTDIR="${DESTDIR}.amd"
+						DESTDIR_LIVE="${DESTDIR_LIVE}.amd"
+						DESTDIR_INSTALL="${DESTDIR_INSTALL}.amd"
+						;;
 
-				i386)
-					DESTDIR="${DESTDIR}.386"
-					DESTDIR_LIVE="${DESTDIR_LIVE}.386"
-					DESTDIR_INSTALL="${DESTDIR_INSTALL}.386"
-					;;
+					i386)
+						DESTDIR="${DESTDIR}.386"
+						DESTDIR_LIVE="${DESTDIR_LIVE}.386"
+						DESTDIR_INSTALL="${DESTDIR_INSTALL}.386"
+						;;
 
-				powerpc)
-					DESTDIR="${DESTDIR}.ppc"
-					DESTDIR_LIVE="${DESTDIR_LIVE}.ppc"
-					DESTDIR_INSTALL="${DESTDIR_INSTALL}.ppc"
-					;;
-			esac
-		fi
+					powerpc)
+						DESTDIR="${DESTDIR}.ppc"
+						DESTDIR_LIVE="${DESTDIR_LIVE}.ppc"
+						DESTDIR_INSTALL="${DESTDIR_INSTALL}.ppc"
+						;;
+				esac
+				;;
+		esac
 	fi
 }
diff --git a/functions/defaults.sh b/functions/defaults.sh
index a5712b75e..f46ec231d 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -669,8 +669,23 @@ 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)
+			case "${LH_ARCHITECTURE}" in
+				amd64|i386)
+					LH_BINARY_IMAGES="${LH_BINARY_IMAGES:-iso-hybrid}"
+					;;
+
+				*)
+					LH_BINARY_IMAGES="${LH_BINARY_IMAGES:-iso}"
+					;;
+			esac
+			;;
+
+		*)
+			LH_BINARY_IMAGES="${LH_BINARY_IMAGES:-iso}"
+			;;
+	esac
 
 	# Setting apt indices
 	if echo ${LH_PACKAGES_LISTS} | grep -qs -E "(stripped|minimal)\b"
@@ -753,7 +768,7 @@ Set_defaults ()
 	if [ -n "${LH_DEBIAN_INSTALLER_PRESEEDFILE}" ]
 	then
 		case "${LH_BINARY_IMAGES}" in
-			iso)
+			iso*)
 				_LH_BOOTAPPEND_PRESEED="file=/cdrom/install/${LH_DEBIAN_INSTALLER_PRESEEDFILE}"
 				;;
 
-- 
cgit v1.2.3