Merge lp:~cyphermox/debian-cd/default-language into lp:~ubuntu-cdimage/debian-cd/ubun3

[Mathieu Trudel-Lapierre]

Language magic for ubuntukylin.

[Mathieu Trudel-Lapierre (cyphermox)]

Work in progress, I haven't done the same thing on all architectures so we could discuss whether that's the right way to handle this.

It's explicitly not removing the isolinux/lang bits for kylin and kubuntu, as they're needed to not pop up the language picker gfxboot menu when the CD loads.

[Mathieu Trudel-Lapierre (cyphermox)]

Now ready for review.

[lp:~cyphermox/debian-cd/default-language]

1909. By Adam Conrad on 2015-04-18

vivid -> Release

1910. By Adam Conrad on 2015-05-08

Copy vivid -> wily, and add wily to CONF.sh

1911. By Mathieu Trudel-Lapierre on 2015-05-14

Provide a way for flavors to specify a default language.

[Colin Watson (cjwatson)]

review: Approve

=== modified file 'tools/boot/wily/boot-amd64'
--- tools/boot/wily/boot-amd64	2015-05-08 05:28:37 +0000
+++ tools/boot/wily/boot-amd64	2015-05-14 16:01:34 +0000
@@ -24,6 +24,7 @@
 fi
 
 default_preseed
+default_language
 
 cd $CDDIR/..
 
 
=== modified file 'tools/boot/wily/boot-amd64+mac'
--- tools/boot/wily/boot-amd64+mac	2015-05-08 05:28:37 +0000
+++ tools/boot/wily/boot-amd64+mac	2015-05-14 16:01:34 +0000
@@ -26,6 +26,7 @@
 fi
 
 default_preseed
+default_language
 
 cd $CDDIR/..
 
 
=== modified file 'tools/boot/wily/boot-armel+dove'
--- tools/boot/wily/boot-armel+dove	2015-05-08 05:28:37 +0000
+++ tools/boot/wily/boot-armel+dove	2015-05-14 16:01:34 +0000
@@ -27,6 +27,7 @@
 fi
 
 default_preseed
+default_language
 
 cd $CDDIR/..
 
 
=== modified file 'tools/boot/wily/boot-armel+omap'
--- tools/boot/wily/boot-armel+omap	2015-05-08 05:28:37 +0000
+++ tools/boot/wily/boot-armel+omap	2015-05-14 16:01:34 +0000
@@ -27,6 +27,7 @@
 fi
 
 default_preseed
+default_language
 
 cd $CDDIR/..
 
 
=== modified file 'tools/boot/wily/boot-i386'
--- tools/boot/wily/boot-i386	2015-05-08 05:28:37 +0000
+++ tools/boot/wily/boot-i386	2015-05-14 16:01:34 +0000
@@ -24,6 +24,7 @@
 fi
 
 default_preseed
+default_language
 
 cd $CDDIR/..
 
 
=== modified file 'tools/boot/wily/boot-i386+mac'
--- tools/boot/wily/boot-i386+mac	2015-05-08 05:28:37 +0000
+++ tools/boot/wily/boot-i386+mac	2015-05-14 16:01:34 +0000
@@ -24,6 +24,7 @@
 fi
 
 default_preseed
+default_language
 
 cd $CDDIR/..
 
 
=== modified file 'tools/boot/wily/boot-powerpc'
--- tools/boot/wily/boot-powerpc	2015-05-08 05:28:37 +0000
+++ tools/boot/wily/boot-powerpc	2015-05-14 16:01:34 +0000
@@ -24,6 +24,7 @@
 fi
 
 default_preseed
+default_language
 
 cd $CDDIR/..
 
 
=== modified file 'tools/boot/wily/boot-ppc64el'
--- tools/boot/wily/boot-ppc64el	2015-05-08 05:28:37 +0000
+++ tools/boot/wily/boot-ppc64el	2015-05-14 16:01:34 +0000
@@ -21,6 +21,7 @@
 fi
 
 default_preseed
+default_language
 
 cd $CDDIR/..
 
 
=== modified file 'tools/boot/wily/common.sh'
--- tools/boot/wily/common.sh	2015-05-08 05:28:37 +0000
+++ tools/boot/wily/common.sh	2015-05-14 16:01:34 +0000
@@ -76,6 +76,14 @@
     fi
 }
 
+default_language() {
+    case $PROJECT in
+	ubuntukylin)
+	    KERNEL_PARAMS="${KERNEL_PARAMS:+$KERNEL_PARAMS }locale=zh_CN keyboard-configuration/layoutcode?=cn"
+	    ;;
+    esac
+}
+
 list_kernel_abis() {
     perl -le '
 	BEGIN { %images = map { $_ => 1 } @ARGV; $found = 0; %abis = (); }