[SCM] live-helper branch, debian, updated. debian/2.0_a7-1-15-g1b862bc

Daniel Baumann daniel at debian.org
Sun Feb 21 09:51:36 UTC 2010


The following commit has been merged in the debian branch:
commit a8e123d4697e587da728768fab5d4a0e3cbd5b65
Author: Daniel Baumann <daniel at debian.org>
Date:   Wed Feb 17 14:57:12 2010 +0100

    Updating error message on arm/armel regarding kernel flavour selection.

diff --git a/functions/defaults.sh b/functions/defaults.sh
index 13399c3..79993f0 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -440,6 +440,12 @@ Set_defaults ()
 	if [ -z "${LH_LINUX_FLAVOURS}" ]
 	then
 		case "${LH_ARCHITECTURE}" in
+			arm|armel)
+				Echo_error "There is no default kernel flavour defined for your architecture."
+				Echo_error "Please configure it manually with 'lh config -k FLAVOUR'."
+				exit 1
+				;;
+
 			alpha)
 				case "${LH_MODE}" in
 					ubuntu)
@@ -530,11 +536,6 @@ Set_defaults ()
 				LH_LINUX_FLAVOURS="sparc64"
 				;;
 
-			arm|armel|m68k)
-				Echo_error "You need to specify the linux kernel flavour manually on ${LH_ARCHITECTURE} (FIXME)."
-				exit 1
-				;;
-
 			*)
 				Echo_error "Architecture ${LH_ARCHITECTURE} not yet supported (FIXME)"
 				exit 1

-- 
live-helper



More information about the debian-live-changes mailing list