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

Proposed by Mathieu Trudel-Lapierre
Status: Merged
Merged at revision: 1911
Proposed branch: lp:~cyphermox/debian-cd/default-language
Merge into: lp:~ubuntu-cdimage/debian-cd/ubun3
Diff against target: 114 lines (+16/-0)
9 files modified
tools/boot/wily/boot-amd64 (+1/-0)
tools/boot/wily/boot-amd64+mac (+1/-0)
tools/boot/wily/boot-armel+dove (+1/-0)
tools/boot/wily/boot-armel+omap (+1/-0)
tools/boot/wily/boot-i386 (+1/-0)
tools/boot/wily/boot-i386+mac (+1/-0)
tools/boot/wily/boot-powerpc (+1/-0)
tools/boot/wily/boot-ppc64el (+1/-0)
tools/boot/wily/common.sh (+8/-0)
To merge this branch: bzr merge lp:~cyphermox/debian-cd/default-language
Reviewer Review Type Date Requested Status
Colin Watson Approve
Review via email: mp+256221@code.launchpad.net

Description of the change

Language magic for ubuntukylin.

To post a comment you must log in.
Revision history for this message
Mathieu Trudel-Lapierre (cyphermox) wrote :

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.

Revision history for this message
Mathieu Trudel-Lapierre (cyphermox) wrote :

Now ready for review.

1909. By Adam Conrad

vivid -> Release

1910. By Adam Conrad

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

1911. By Mathieu Trudel-Lapierre

Provide a way for flavors to specify a default language.

Revision history for this message
Colin Watson (cjwatson) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tools/boot/wily/boot-amd64'
2--- tools/boot/wily/boot-amd64 2015-05-08 05:28:37 +0000
3+++ tools/boot/wily/boot-amd64 2015-05-14 16:01:34 +0000
4@@ -24,6 +24,7 @@
5 fi
6
7 default_preseed
8+default_language
9
10 cd $CDDIR/..
11
12
13=== modified file 'tools/boot/wily/boot-amd64+mac'
14--- tools/boot/wily/boot-amd64+mac 2015-05-08 05:28:37 +0000
15+++ tools/boot/wily/boot-amd64+mac 2015-05-14 16:01:34 +0000
16@@ -26,6 +26,7 @@
17 fi
18
19 default_preseed
20+default_language
21
22 cd $CDDIR/..
23
24
25=== modified file 'tools/boot/wily/boot-armel+dove'
26--- tools/boot/wily/boot-armel+dove 2015-05-08 05:28:37 +0000
27+++ tools/boot/wily/boot-armel+dove 2015-05-14 16:01:34 +0000
28@@ -27,6 +27,7 @@
29 fi
30
31 default_preseed
32+default_language
33
34 cd $CDDIR/..
35
36
37=== modified file 'tools/boot/wily/boot-armel+omap'
38--- tools/boot/wily/boot-armel+omap 2015-05-08 05:28:37 +0000
39+++ tools/boot/wily/boot-armel+omap 2015-05-14 16:01:34 +0000
40@@ -27,6 +27,7 @@
41 fi
42
43 default_preseed
44+default_language
45
46 cd $CDDIR/..
47
48
49=== modified file 'tools/boot/wily/boot-i386'
50--- tools/boot/wily/boot-i386 2015-05-08 05:28:37 +0000
51+++ tools/boot/wily/boot-i386 2015-05-14 16:01:34 +0000
52@@ -24,6 +24,7 @@
53 fi
54
55 default_preseed
56+default_language
57
58 cd $CDDIR/..
59
60
61=== modified file 'tools/boot/wily/boot-i386+mac'
62--- tools/boot/wily/boot-i386+mac 2015-05-08 05:28:37 +0000
63+++ tools/boot/wily/boot-i386+mac 2015-05-14 16:01:34 +0000
64@@ -24,6 +24,7 @@
65 fi
66
67 default_preseed
68+default_language
69
70 cd $CDDIR/..
71
72
73=== modified file 'tools/boot/wily/boot-powerpc'
74--- tools/boot/wily/boot-powerpc 2015-05-08 05:28:37 +0000
75+++ tools/boot/wily/boot-powerpc 2015-05-14 16:01:34 +0000
76@@ -24,6 +24,7 @@
77 fi
78
79 default_preseed
80+default_language
81
82 cd $CDDIR/..
83
84
85=== modified file 'tools/boot/wily/boot-ppc64el'
86--- tools/boot/wily/boot-ppc64el 2015-05-08 05:28:37 +0000
87+++ tools/boot/wily/boot-ppc64el 2015-05-14 16:01:34 +0000
88@@ -21,6 +21,7 @@
89 fi
90
91 default_preseed
92+default_language
93
94 cd $CDDIR/..
95
96
97=== modified file 'tools/boot/wily/common.sh'
98--- tools/boot/wily/common.sh 2015-05-08 05:28:37 +0000
99+++ tools/boot/wily/common.sh 2015-05-14 16:01:34 +0000
100@@ -76,6 +76,14 @@
101 fi
102 }
103
104+default_language() {
105+ case $PROJECT in
106+ ubuntukylin)
107+ KERNEL_PARAMS="${KERNEL_PARAMS:+$KERNEL_PARAMS }locale=zh_CN keyboard-configuration/layoutcode?=cn"
108+ ;;
109+ esac
110+}
111+
112 list_kernel_abis() {
113 perl -le '
114 BEGIN { %images = map { $_ => 1 } @ARGV; $found = 0; %abis = (); }

Subscribers

People subscribed via source and target branches