[SCM] debian-live branch, master, updated. 1.0.0-2-5-gbf36be7

[Daniel Baumann]

The following commit has been merged in the master branch:
commit bf36be707ba7d4a1b3da2544b6c286a4745447bf
Author: Daniel Baumann <daniel at debian.org>
Date:   Wed Sep 3 11:02:30 2008 +0200

    Don't install more than one kernel image when building minimal or stripped images.

diff --git a/functions/defaults.sh b/functions/defaults.sh
index ba3d944..54d28f1 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -391,7 +391,15 @@ Set_defaults ()
 				;;
 
 			i386)
-				LH_LINUX_FLAVOURS="486 686"
+				case "${LIST}" in
+					stripped|minimal)
+						LH_LINUX_FLAVOURS="486"
+						;;
+
+					*)
+						LH_LINUX_FLAVOURS="486 686"
+						;;
+				esac
 				;;
 
 			ia64)
@@ -404,7 +412,15 @@ Set_defaults ()
 				;;
 
 			powerpc)
-				LH_LINUX_FLAVOURS="powerpc powerpc64"
+				case "${LIST}" in
+					stripped|minimal)
+						LH_LINUX_FLAVOURS="powerpc"
+						;;
+
+					*)
+						LH_LINUX_FLAVOURS="powerpc powerpc64"
+						;;
+				esac
 				;;
 
 			s390)

-- 
debian-live