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

Daniel Baumann daniel at debian.org
Fri Feb 19 12:14:18 UTC 2010


The following commit has been merged in the debian-next branch:
commit d669b7d3cee298a9048c71d3301a837f8e2dfef1
Author: Daniel Baumann <daniel at debian.org>
Date:   Fri Feb 19 13:10:18 2010 +0100

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

diff --git a/functions/defaults.sh b/functions/defaults.sh
index 7fc8567..b4a34ce 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -671,7 +671,15 @@ Set_defaults ()
 	# Setting image type
 	case "${LH_DISTRIBUTION}" in
 		squeeze|sid)
-			LH_BINARY_IMAGES="${LH_BINARY_IMAGES:-iso-hybrid}"
+			case "${LH_ARCHITECTURE}"
+				amd64|i386)
+					LH_BINARY_IMAGES="${LH_BINARY_IMAGES:-iso-hybrid}"
+					;;
+
+				*)
+					LH_BINARY_IMAGES="${LH_BINARY_IMAGES:-iso}"
+					;;
+			esac
 			;;
 
 		*)

-- 
live-helper



More information about the debian-live-changes mailing list