debian-cd

Merge lp:~cyphermox/debian-cd/kylin-default-cn-uefi into lp:~ubuntu-cdimage/debian-cd/ubun3

  1. kylin-default-cn-uefi
  2. Merge into ubun3
Proposed by Mathieu Trudel-Lapierre
Status: Merged
Merge reported by: Adam Conrad
Merged at revision: not available
Proposed branch: lp:~cyphermox/debian-cd/kylin-default-cn-uefi
Merge into: lp:~ubuntu-cdimage/debian-cd/ubun3
Diff against target: 229 lines (+32/-0)
18 files modified
tools/boot/trusty/boot-amd64 (+1/-0)
tools/boot/trusty/boot-amd64+mac (+1/-0)
tools/boot/trusty/boot-armel+dove (+1/-0)
tools/boot/trusty/boot-armel+omap (+1/-0)
tools/boot/trusty/boot-i386 (+1/-0)
tools/boot/trusty/boot-i386+mac (+1/-0)
tools/boot/trusty/boot-powerpc (+1/-0)
tools/boot/trusty/boot-ppc64el (+1/-0)
tools/boot/trusty/common.sh (+8/-0)
tools/boot/vivid/boot-amd64 (+1/-0)
tools/boot/vivid/boot-amd64+mac (+1/-0)
tools/boot/vivid/boot-armel+dove (+1/-0)
tools/boot/vivid/boot-armel+omap (+1/-0)
tools/boot/vivid/boot-i386 (+1/-0)
tools/boot/vivid/boot-i386+mac (+1/-0)
tools/boot/vivid/boot-powerpc (+1/-0)
tools/boot/vivid/boot-ppc64el (+1/-0)
tools/boot/vivid/common.sh (+8/-0)
To merge this branch: bzr merge lp:~cyphermox/debian-cd/kylin-default-cn-uefi
Reviewer Review Type Date Requested Status
Ubuntu CD Image Team Pending
Review via email: mp+267113@code.launchpad.net

Description of the change

Language magic for UbuntuKylin, applied to Trusty and Vivid for point releases.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tools/boot/trusty/boot-amd64'
2--- tools/boot/trusty/boot-amd64 2015-01-10 00:17:28 +0000
3+++ tools/boot/trusty/boot-amd64 2015-08-05 22:53:42 +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/trusty/boot-amd64+mac'
14--- tools/boot/trusty/boot-amd64+mac 2015-01-10 00:17:28 +0000
15+++ tools/boot/trusty/boot-amd64+mac 2015-08-05 22:53:42 +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/trusty/boot-armel+dove'
26--- tools/boot/trusty/boot-armel+dove 2013-10-18 14:52:32 +0000
27+++ tools/boot/trusty/boot-armel+dove 2015-08-05 22:53:42 +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/trusty/boot-armel+omap'
38--- tools/boot/trusty/boot-armel+omap 2013-10-18 14:52:32 +0000
39+++ tools/boot/trusty/boot-armel+omap 2015-08-05 22:53:42 +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/trusty/boot-i386'
50--- tools/boot/trusty/boot-i386 2015-01-10 00:17:28 +0000
51+++ tools/boot/trusty/boot-i386 2015-08-05 22:53:42 +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/trusty/boot-i386+mac'
62--- tools/boot/trusty/boot-i386+mac 2013-10-18 14:52:32 +0000
63+++ tools/boot/trusty/boot-i386+mac 2015-08-05 22:53:42 +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/trusty/boot-powerpc'
74--- tools/boot/trusty/boot-powerpc 2015-01-10 00:17:28 +0000
75+++ tools/boot/trusty/boot-powerpc 2015-08-05 22:53:42 +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/trusty/boot-ppc64el'
86--- tools/boot/trusty/boot-ppc64el 2015-01-10 00:17:28 +0000
87+++ tools/boot/trusty/boot-ppc64el 2015-08-05 22:53:42 +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/trusty/common.sh'
98--- tools/boot/trusty/common.sh 2013-10-18 14:52:32 +0000
99+++ tools/boot/trusty/common.sh 2015-08-05 22:53:42 +0000
100@@ -70,6 +70,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 = (); }
115
116=== modified file 'tools/boot/vivid/boot-amd64'
117--- tools/boot/vivid/boot-amd64 2015-03-03 17:02:34 +0000
118+++ tools/boot/vivid/boot-amd64 2015-08-05 22:53:42 +0000
119@@ -24,6 +24,7 @@
120 fi
121
122 default_preseed
123+default_language
124
125 cd $CDDIR/..
126
127
128=== modified file 'tools/boot/vivid/boot-amd64+mac'
129--- tools/boot/vivid/boot-amd64+mac 2015-03-03 17:02:34 +0000
130+++ tools/boot/vivid/boot-amd64+mac 2015-08-05 22:53:42 +0000
131@@ -26,6 +26,7 @@
132 fi
133
134 default_preseed
135+default_language
136
137 cd $CDDIR/..
138
139
140=== modified file 'tools/boot/vivid/boot-armel+dove'
141--- tools/boot/vivid/boot-armel+dove 2015-03-03 17:02:34 +0000
142+++ tools/boot/vivid/boot-armel+dove 2015-08-05 22:53:42 +0000
143@@ -27,6 +27,7 @@
144 fi
145
146 default_preseed
147+default_language
148
149 cd $CDDIR/..
150
151
152=== modified file 'tools/boot/vivid/boot-armel+omap'
153--- tools/boot/vivid/boot-armel+omap 2014-10-24 20:13:50 +0000
154+++ tools/boot/vivid/boot-armel+omap 2015-08-05 22:53:42 +0000
155@@ -27,6 +27,7 @@
156 fi
157
158 default_preseed
159+default_language
160
161 cd $CDDIR/..
162
163
164=== modified file 'tools/boot/vivid/boot-i386'
165--- tools/boot/vivid/boot-i386 2015-03-03 17:02:34 +0000
166+++ tools/boot/vivid/boot-i386 2015-08-05 22:53:42 +0000
167@@ -24,6 +24,7 @@
168 fi
169
170 default_preseed
171+default_language
172
173 cd $CDDIR/..
174
175
176=== modified file 'tools/boot/vivid/boot-i386+mac'
177--- tools/boot/vivid/boot-i386+mac 2014-10-24 20:13:50 +0000
178+++ tools/boot/vivid/boot-i386+mac 2015-08-05 22:53:42 +0000
179@@ -24,6 +24,7 @@
180 fi
181
182 default_preseed
183+default_language
184
185 cd $CDDIR/..
186
187
188=== modified file 'tools/boot/vivid/boot-powerpc'
189--- tools/boot/vivid/boot-powerpc 2015-01-12 15:59:57 +0000
190+++ tools/boot/vivid/boot-powerpc 2015-08-05 22:53:42 +0000
191@@ -24,6 +24,7 @@
192 fi
193
194 default_preseed
195+default_language
196
197 cd $CDDIR/..
198
199
200=== modified file 'tools/boot/vivid/boot-ppc64el'
201--- tools/boot/vivid/boot-ppc64el 2014-10-24 20:13:50 +0000
202+++ tools/boot/vivid/boot-ppc64el 2015-08-05 22:53:42 +0000
203@@ -21,6 +21,7 @@
204 fi
205
206 default_preseed
207+default_language
208
209 cd $CDDIR/..
210
211
212=== modified file 'tools/boot/vivid/common.sh'
213--- tools/boot/vivid/common.sh 2015-01-12 15:59:57 +0000
214+++ tools/boot/vivid/common.sh 2015-08-05 22:53:42 +0000
215@@ -76,6 +76,14 @@
216 fi
217 }
218
219+default_language() {
220+ case $PROJECT in
221+ ubuntukylin)
222+ KERNEL_PARAMS="${KERNEL_PARAMS:+$KERNEL_PARAMS }locale=zh_CN keyboard-configuration/layoutcode?=cn"
223+ ;;
224+ esac
225+}
226+
227 list_kernel_abis() {
228 perl -le '
229 BEGIN { %images = map { $_ => 1 } @ARGV; $found = 0; %abis = (); }

Subscribers

People subscribed via source and target branches