[SCM] Debian Live build scripts branch, master, updated. 1.0.1-1-58-gbf387fd

[Daniel Baumann]

The following commit has been merged in the master branch:
commit bf387fd82e7d54856f928bd6278f9c56affef940
Author: Daniel Baumann <daniel at debian.org>
Date:   Wed Oct 29 18:31:20 2008 +0100

    Adding armel to architecture specific checks.

diff --git a/functions/defaults.sh b/functions/defaults.sh
index 414d586..bc4e839 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -379,11 +379,6 @@ Set_defaults ()
 				LH_LINUX_FLAVOURS="amd64"
 				;;
 
-			arm)
-				Echo_error "You need to specify the linux kernel flavour manually on arm (FIXME)."
-				exit 1
-				;;
-
 			hppa)
 				LH_LINUX_FLAVOURS="parisc"
 				;;
@@ -404,11 +399,6 @@ Set_defaults ()
 				LH_LINUX_FLAVOURS="itanium"
 				;;
 
-			m68k)
-				Echo_error "You need to specify the linux kernel flavour manually on m68k (FIXME)."
-				exit 1
-				;;
-
 			powerpc)
 				case "${LIST}" in
 					stripped|minimal)
@@ -434,6 +424,11 @@ Set_defaults ()
 				fi
 				;;
 
+			arm|armel|m68k)
+				Echo_error "You need to specify the linux kernel flavour manually on ${LH_ARCHITECTURE} (FIXME)."
+				exit 1
+				;;
+
 			*)
 				Echo_error "Architecture not yet supported (FIXME)"
 				;;
diff --git a/helpers/lh_binary_debian-installer b/helpers/lh_binary_debian-installer
index 5dca679..3ab6252 100755
--- a/helpers/lh_binary_debian-installer
+++ b/helpers/lh_binary_debian-installer
@@ -268,7 +268,7 @@ then
 			URL="http://people.debian.org/~aba/d-i/images/daily/"
 			;;
 
-		arm)
+		arm|armel)
 			URL="http://people.debian.org/~kmuto/d-i/images/daily/"
 			;;
 

-- 
Debian Live build scripts