Merge lp:~cyphermox/debian-cd/kernel-cli-separator-trusty into lp:~ubuntu-cdimage/debian-cd/ubuntu

Proposed by Mathieu Trudel-Lapierre on 2016-02-24
Status: Merged
Merged at revision: 1932
Proposed branch: lp:~cyphermox/debian-cd/kernel-cli-separator-trusty
Merge into: lp:~ubuntu-cdimage/debian-cd/ubuntu
Diff against target: 395 lines (+48/-48)
5 files modified
tools/boot/trusty/boot-amd64 (+22/-22)
tools/boot/trusty/boot-amd64+mac (+12/-12)
tools/boot/trusty/boot-armel+dove (+1/-1)
tools/boot/trusty/boot-i386 (+12/-12)
tools/boot/trusty/post-boot-armel+omap (+1/-1)
To merge this branch: bzr merge lp:~cyphermox/debian-cd/kernel-cli-separator-trusty
Reviewer Review Type Date Requested Status
Ubuntu CD Image Team 2016-02-24 Pending
Review via email: mp+287089@code.launchpad.net

Description of the change

Fix the kernel command-line separator for options to pass on to the installed system and such; using --- also makes sure the kernel doesn't just ignore anything passed after a simple '--'.

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-08-05 22:52:14 +0000
3+++ tools/boot/trusty/boot-amd64 2016-02-24 19:25:48 +0000
4@@ -384,19 +384,19 @@
5 label live
6 menu label $livelabel
7 kernel $CASPER_KERNEL
8- append $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper$liveparams initrd=$CASPER_INITRD quiet splash --
9+ append $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper$liveparams initrd=$CASPER_INITRD quiet splash ---
10 EOF
11 cat >> $CDDIR/boot/grub/grub.cfg <<EOF
12 menuentry "${livelabel#^}" {
13 set gfxpayload=keep
14- linux $CASPER_KERNEL $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper$liveparams quiet splash --
15+ linux $CASPER_KERNEL $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper$liveparams quiet splash ---
16 initrd $CASPER_INITRD
17 }
18 EOF
19 cat >> $CDDIR/boot/grub/loopback.cfg <<EOF
20 menuentry "${livelabel#^}" {
21 set gfxpayload=keep
22- linux $CASPER_KERNEL $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper$liveparams iso-scan/filename=\${iso_path} quiet splash --
23+ linux $CASPER_KERNEL $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper$liveparams iso-scan/filename=\${iso_path} quiet splash ---
24 initrd $CASPER_INITRD
25 }
26 EOF
27@@ -405,18 +405,18 @@
28 label live-install
29 menu label ^Install $HUMANPROJECT
30 kernel $CASPER_KERNEL
31- append $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper only-ubiquity initrd=$CASPER_INITRD quiet splash --
32+ append $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper only-ubiquity initrd=$CASPER_INITRD quiet splash ---
33 EOF
34 cat >> $CDDIR/boot/grub/grub.cfg <<EOF
35 menuentry "Install $HUMANPROJECT" {
36 set gfxpayload=keep
37- linux $CASPER_KERNEL $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper only-ubiquity quiet splash --
38+ linux $CASPER_KERNEL $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper only-ubiquity quiet splash ---
39 initrd $CASPER_INITRD
40 }
41 EOF
42 cat >> $CDDIR/boot/grub/loopback.cfg <<EOF
43 menuentry "Install $HUMANPROJECT" {
44- linux $CASPER_KERNEL $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper only-ubiquity iso-scan/filename=\${iso_path} quiet splash --
45+ linux $CASPER_KERNEL $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper only-ubiquity iso-scan/filename=\${iso_path} quiet splash ---
46 initrd $CASPER_INITRD
47 }
48 EOF
49@@ -433,12 +433,12 @@
50 label install
51 menu label ^Install $HUMANPROJECT
52 kernel /install/vmlinuz
53- append $KERNEL_PARAMS $DEFAULT_PRESEED vga=788 initrd=/install/initrd.gz quiet --
54+ append $KERNEL_PARAMS $DEFAULT_PRESEED vga=788 initrd=/install/initrd.gz quiet ---
55 EOF
56 cat >> $CDDIR/boot/grub/grub.cfg <<EOF
57 menuentry "Install $HUMANPROJECT" {
58 set gfxpayload=keep
59- linux /install/vmlinuz $KERNEL_PARAMS $DEFAULT_PRESEED quiet --
60+ linux /install/vmlinuz $KERNEL_PARAMS $DEFAULT_PRESEED quiet ---
61 initrd /install/initrd.gz
62 }
63 EOF
64@@ -447,12 +447,12 @@
65 label install
66 menu label ^Install $HUMANPROJECT in text mode
67 kernel /install/vmlinuz
68- append $KERNEL_PARAMS $DEFAULT_PRESEED vga=788 initrd=/install/initrd.gz quiet --
69+ append $KERNEL_PARAMS $DEFAULT_PRESEED vga=788 initrd=/install/initrd.gz quiet ---
70 EOF
71 cat >> $CDDIR/boot/grub/grub.cfg <<EOF
72 menuentry "Install $HUMANPROJECT in text mode" {
73 set gfxpayload=keep
74- linux /install/vmlinuz $KERNEL_PARAMS $DEFAULT_PRESEED quiet --
75+ linux /install/vmlinuz $KERNEL_PARAMS $DEFAULT_PRESEED quiet ---
76 initrd /install/initrd.gz
77 }
78 EOF
79@@ -461,7 +461,7 @@
80 label expert
81 menu hide
82 kernel /install/vmlinuz
83- append $KERNEL_PARAMS $DEFAULT_PRESEED priority=low vga=788 initrd=/install/initrd.gz --
84+ append $KERNEL_PARAMS $DEFAULT_PRESEED priority=low vga=788 initrd=/install/initrd.gz ---
85 EOF
86 if [ "$PROJECT" = edubuntu ]; then
87 cat >> boot$N/isolinux/gfxboot.cfg <<EOF
88@@ -493,7 +493,7 @@
89 cat >> $CDDIR/boot/grub/grub.cfg <<EOF
90 menuentry "OEM install (for manufacturers)" {
91 set gfxpayload=keep
92- linux $CASPER_KERNEL $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper only-ubiquity quiet splash oem-config/enable=true --
93+ linux $CASPER_KERNEL $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper only-ubiquity quiet splash oem-config/enable=true ---
94 initrd $CASPER_INITRD
95 }
96 EOF
97@@ -504,7 +504,7 @@
98 cat >> $CDDIR/boot/grub/grub.cfg <<EOF
99 menuentry "OEM install (for manufacturers)" {
100 set gfxpayload=keep
101- linux /install/vmlinuz $KERNEL_PARAMS $DEFAULT_PRESEED quiet oem-config/enable=true --
102+ linux /install/vmlinuz $KERNEL_PARAMS $DEFAULT_PRESEED quiet oem-config/enable=true ---
103 initrd /install/initrd.gz
104 }
105 EOF
106@@ -531,12 +531,12 @@
107 label cloud
108 menu label ^Multiple server install with MAAS
109 kernel /install/vmlinuz
110- append $KERNEL_PARAMS $FRONTEND_BACKGROUND modules=maas-enlist-udeb vga=788 initrd=/install/initrd.gz quiet --
111+ append $KERNEL_PARAMS $FRONTEND_BACKGROUND modules=maas-enlist-udeb vga=788 initrd=/install/initrd.gz quiet ---
112 EOF
113 cat >> $CDDIR/boot/grub/grub.cfg <<EOF
114 menuentry "Multiple server install with MAAS" {
115 set gfxpayload=keep
116- linux /install/vmlinuz $KERNEL_PARAMS modules=maas-enlist-udeb vga=788 initrd=/install/initrd.gz quiet --
117+ linux /install/vmlinuz $KERNEL_PARAMS modules=maas-enlist-udeb vga=788 initrd=/install/initrd.gz quiet ---
118 initrd /install/initrd.gz
119 }
120 EOF
121@@ -561,18 +561,18 @@
122 label check
123 menu label ^Check disc for defects
124 kernel $CASPER_KERNEL
125- append $KERNEL_PARAMS boot=casper integrity-check initrd=$CASPER_INITRD quiet splash --
126+ append $KERNEL_PARAMS boot=casper integrity-check initrd=$CASPER_INITRD quiet splash ---
127 EOF
128 cat >> $CDDIR/boot/grub/grub.cfg <<EOF
129 menuentry "Check disc for defects" {
130 set gfxpayload=keep
131- linux $CASPER_KERNEL $KERNEL_PARAMS boot=casper integrity-check quiet splash --
132+ linux $CASPER_KERNEL $KERNEL_PARAMS boot=casper integrity-check quiet splash ---
133 initrd $CASPER_INITRD
134 }
135 EOF
136 cat >> $CDDIR/boot/grub/loopback.cfg <<EOF
137 menuentry "Check disc for defects" {
138- linux $CASPER_KERNEL $KERNEL_PARAMS boot=casper integrity-check iso-scan/filename=\${iso_path} quiet splash --
139+ linux $CASPER_KERNEL $KERNEL_PARAMS boot=casper integrity-check iso-scan/filename=\${iso_path} quiet splash ---
140 initrd $CASPER_INITRD
141 }
142 EOF
143@@ -581,12 +581,12 @@
144 label check
145 menu label ^Check disc for defects
146 kernel /install/vmlinuz
147- append $KERNEL_PARAMS $FRONTEND_BACKGROUND MENU=/bin/cdrom-checker-menu vga=788 initrd=/install/initrd.gz quiet --
148+ append $KERNEL_PARAMS $FRONTEND_BACKGROUND MENU=/bin/cdrom-checker-menu vga=788 initrd=/install/initrd.gz quiet ---
149 EOF
150 cat >> $CDDIR/boot/grub/grub.cfg <<EOF
151 menuentry "Check disc for defects" {
152 set gfxpayload=keep
153- linux /install/vmlinuz $KERNEL_PARAMS MENU=/bin/cdrom-checker-menu quiet --
154+ linux /install/vmlinuz $KERNEL_PARAMS MENU=/bin/cdrom-checker-menu quiet ---
155 initrd /install/initrd.gz
156 }
157 EOF
158@@ -596,12 +596,12 @@
159 label rescue
160 menu label ^Rescue a broken system
161 kernel /install/vmlinuz
162- append $KERNEL_PARAMS $FRONTEND_BACKGROUND rescue/enable=true vga=788 initrd=/install/initrd.gz --
163+ append $KERNEL_PARAMS $FRONTEND_BACKGROUND rescue/enable=true vga=788 initrd=/install/initrd.gz ---
164 EOF
165 cat >> $CDDIR/boot/grub/grub.cfg <<EOF
166 menuentry "Rescue a broken system" {
167 set gfxpayload=keep
168- linux /install/vmlinuz $KERNEL_PARAMS rescue/enable=true --
169+ linux /install/vmlinuz $KERNEL_PARAMS rescue/enable=true ---
170 initrd /install/initrd.gz
171 }
172 EOF
173
174=== modified file 'tools/boot/trusty/boot-amd64+mac'
175--- tools/boot/trusty/boot-amd64+mac 2015-08-05 22:52:14 +0000
176+++ tools/boot/trusty/boot-amd64+mac 2016-02-24 19:25:48 +0000
177@@ -360,12 +360,12 @@
178 label live
179 menu label $livelabel
180 kernel /casper/vmlinuz
181- append $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper$liveparams initrd=$CASPER_INITRD quiet splash --
182+ append $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper$liveparams initrd=$CASPER_INITRD quiet splash ---
183 EOF
184 cat >> $CDDIR/boot/grub/loopback.cfg <<EOF
185 menuentry "${livelabel#^}" {
186 set gfxpayload=keep
187- linux /casper/vmlinuz $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper$liveparams iso-scan/filename=\${iso_path} quiet splash --
188+ linux /casper/vmlinuz $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper$liveparams iso-scan/filename=\${iso_path} quiet splash ---
189 initrd $CASPER_INITRD
190 }
191 EOF
192@@ -374,11 +374,11 @@
193 label live-install
194 menu label ^Install $HUMANPROJECT
195 kernel /casper/vmlinuz
196- append $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper only-ubiquity initrd=$CASPER_INITRD quiet splash --
197+ append $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper only-ubiquity initrd=$CASPER_INITRD quiet splash ---
198 EOF
199 cat >> $CDDIR/boot/grub/loopback.cfg <<EOF
200 menuentry "Install $HUMANPROJECT" {
201- linux /casper/vmlinuz $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper only-ubiquity iso-scan/filename=\${iso_path} quiet splash --
202+ linux /casper/vmlinuz $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper only-ubiquity iso-scan/filename=\${iso_path} quiet splash ---
203 initrd $CASPER_INITRD
204 }
205 EOF
206@@ -395,21 +395,21 @@
207 label install
208 menu label ^Install $HUMANPROJECT
209 kernel /install/vmlinuz
210- append $KERNEL_PARAMS $DEFAULT_PRESEED vga=788 initrd=/install/initrd.gz quiet --
211+ append $KERNEL_PARAMS $DEFAULT_PRESEED vga=788 initrd=/install/initrd.gz quiet ---
212 EOF
213 else
214 cat >> boot$N/isolinux/txt.cfg <<EOF
215 label install
216 menu label ^Install $HUMANPROJECT in text mode
217 kernel /install/vmlinuz
218- append $KERNEL_PARAMS $DEFAULT_PRESEED vga=788 initrd=/install/initrd.gz quiet --
219+ append $KERNEL_PARAMS $DEFAULT_PRESEED vga=788 initrd=/install/initrd.gz quiet ---
220 EOF
221 fi
222 cat >> boot$N/isolinux/adtxt.cfg <<EOF
223 label expert
224 menu hide
225 kernel /install/vmlinuz
226- append $KERNEL_PARAMS $DEFAULT_PRESEED priority=low vga=788 initrd=/install/initrd.gz --
227+ append $KERNEL_PARAMS $DEFAULT_PRESEED priority=low vga=788 initrd=/install/initrd.gz ---
228 EOF
229 if [ "$PROJECT" = edubuntu ]; then
230 cat >> boot$N/isolinux/gfxboot.cfg <<EOF
231@@ -461,7 +461,7 @@
232 label cloud
233 menu label ^Multiple server install with MAAS
234 kernel /install/vmlinuz
235- append $KERNEL_PARAMS $FRONTEND_BACKGROUND modules=maas-enlist-udeb vga=788 initrd=/install/initrd.gz quiet --
236+ append $KERNEL_PARAMS $FRONTEND_BACKGROUND modules=maas-enlist-udeb vga=788 initrd=/install/initrd.gz quiet ---
237 EOF
238 fi
239 fi
240@@ -484,11 +484,11 @@
241 label check
242 menu label ^Check disc for defects
243 kernel /casper/vmlinuz
244- append $KERNEL_PARAMS boot=casper integrity-check initrd=$CASPER_INITRD quiet splash --
245+ append $KERNEL_PARAMS boot=casper integrity-check initrd=$CASPER_INITRD quiet splash ---
246 EOF
247 cat >> $CDDIR/boot/grub/loopback.cfg <<EOF
248 menuentry "Check disc for defects" {
249- linux /casper/vmlinuz $KERNEL_PARAMS boot=casper integrity-check iso-scan/filename=\${iso_path} quiet splash --
250+ linux /casper/vmlinuz $KERNEL_PARAMS boot=casper integrity-check iso-scan/filename=\${iso_path} quiet splash ---
251 initrd $CASPER_INITRD
252 }
253 EOF
254@@ -497,7 +497,7 @@
255 label check
256 menu label ^Check disc for defects
257 kernel /install/vmlinuz
258- append $KERNEL_PARAMS $FRONTEND_BACKGROUND MENU=/bin/cdrom-checker-menu vga=788 initrd=/install/initrd.gz quiet --
259+ append $KERNEL_PARAMS $FRONTEND_BACKGROUND MENU=/bin/cdrom-checker-menu vga=788 initrd=/install/initrd.gz quiet ---
260 EOF
261 fi
262 if [ "$CDIMAGE_INSTALL_BASE" = 1 ]; then
263@@ -505,7 +505,7 @@
264 label rescue
265 menu label ^Rescue a broken system
266 kernel /install/vmlinuz
267- append $KERNEL_PARAMS $FRONTEND_BACKGROUND rescue/enable=true vga=788 initrd=/install/initrd.gz --
268+ append $KERNEL_PARAMS $FRONTEND_BACKGROUND rescue/enable=true vga=788 initrd=/install/initrd.gz ---
269 EOF
270 fi
271 cat >> boot$N/isolinux/txt.cfg <<EOF
272
273=== modified file 'tools/boot/trusty/boot-armel+dove'
274--- tools/boot/trusty/boot-armel+dove 2015-08-05 22:52:14 +0000
275+++ tools/boot/trusty/boot-armel+dove 2016-02-24 19:25:48 +0000
276@@ -120,7 +120,7 @@
277 uboot_input_initrd="$CDDIR/casper/filesystem.initrd-$FLAVOUR"
278 uboot_kernel="/casper/uImage"
279 uboot_initrd="/casper/uInitrd"
280- uboot_extra_cmdline=" -- boot=casper"
281+ uboot_extra_cmdline=" --- boot=casper"
282 fi
283
284 if [ "$do_uboot" ]; then
285
286=== modified file 'tools/boot/trusty/boot-i386'
287--- tools/boot/trusty/boot-i386 2015-08-05 22:52:14 +0000
288+++ tools/boot/trusty/boot-i386 2016-02-24 19:25:48 +0000
289@@ -364,11 +364,11 @@
290 label live
291 menu label $livelabel
292 kernel /casper/vmlinuz
293- append $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper$liveparams initrd=$CASPER_INITRD quiet splash --
294+ append $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper$liveparams initrd=$CASPER_INITRD quiet splash ---
295 EOF
296 cat >> $CDDIR/boot/grub/loopback.cfg <<EOF
297 menuentry "${livelabel#^}" {
298- linux /casper/vmlinuz $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper$liveparams iso-scan/filename=\${iso_path} quiet splash --
299+ linux /casper/vmlinuz $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper$liveparams iso-scan/filename=\${iso_path} quiet splash ---
300 initrd $CASPER_INITRD
301 }
302 EOF
303@@ -377,11 +377,11 @@
304 label live-install
305 menu label ^Install $HUMANPROJECT
306 kernel /casper/vmlinuz
307- append $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper only-ubiquity initrd=$CASPER_INITRD quiet splash --
308+ append $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper only-ubiquity initrd=$CASPER_INITRD quiet splash ---
309 EOF
310 cat >> $CDDIR/boot/grub/loopback.cfg <<EOF
311 menuentry "Install $HUMANPROJECT" {
312- linux /casper/vmlinuz $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper only-ubiquity iso-scan/filename=\${iso_path} quiet splash --
313+ linux /casper/vmlinuz $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper only-ubiquity iso-scan/filename=\${iso_path} quiet splash ---
314 initrd $CASPER_INITRD
315 }
316 EOF
317@@ -398,21 +398,21 @@
318 label install
319 menu label ^Install $HUMANPROJECT
320 kernel /install/vmlinuz
321- append $KERNEL_PARAMS $DEFAULT_PRESEED vga=788 initrd=/install/initrd.gz quiet --
322+ append $KERNEL_PARAMS $DEFAULT_PRESEED vga=788 initrd=/install/initrd.gz quiet ---
323 EOF
324 else
325 cat >> boot$N/isolinux/txt.cfg <<EOF
326 label install
327 menu label ^Install $HUMANPROJECT in text mode
328 kernel /install/vmlinuz
329- append $KERNEL_PARAMS $DEFAULT_PRESEED vga=788 initrd=/install/initrd.gz quiet --
330+ append $KERNEL_PARAMS $DEFAULT_PRESEED vga=788 initrd=/install/initrd.gz quiet ---
331 EOF
332 fi
333 cat >> boot$N/isolinux/adtxt.cfg <<EOF
334 label expert
335 menu hide
336 kernel /install/vmlinuz
337- append $KERNEL_PARAMS $DEFAULT_PRESEED priority=low vga=788 initrd=/install/initrd.gz --
338+ append $KERNEL_PARAMS $DEFAULT_PRESEED priority=low vga=788 initrd=/install/initrd.gz ---
339 EOF
340 if [ "$PROJECT" = edubuntu ]; then
341 cat >> boot$N/isolinux/gfxboot.cfg <<EOF
342@@ -464,7 +464,7 @@
343 label cloud
344 menu label ^Multiple server install with MAAS
345 kernel /install/vmlinuz
346- append $KERNEL_PARAMS $FRONTEND_BACKGROUND modules=maas-enlist-udeb vga=788 initrd=/install/initrd.gz quiet --
347+ append $KERNEL_PARAMS $FRONTEND_BACKGROUND modules=maas-enlist-udeb vga=788 initrd=/install/initrd.gz quiet ---
348 EOF
349 fi
350 fi
351@@ -487,11 +487,11 @@
352 label check
353 menu label ^Check disc for defects
354 kernel /casper/vmlinuz
355- append $KERNEL_PARAMS boot=casper integrity-check initrd=$CASPER_INITRD quiet splash --
356+ append $KERNEL_PARAMS boot=casper integrity-check initrd=$CASPER_INITRD quiet splash ---
357 EOF
358 cat >> $CDDIR/boot/grub/loopback.cfg <<EOF
359 menuentry "Check disc for defects" {
360- linux /casper/vmlinuz $KERNEL_PARAMS boot=casper integrity-check iso-scan/filename=\${iso_path} quiet splash --
361+ linux /casper/vmlinuz $KERNEL_PARAMS boot=casper integrity-check iso-scan/filename=\${iso_path} quiet splash ---
362 initrd $CASPER_INITRD
363 }
364 EOF
365@@ -500,7 +500,7 @@
366 label check
367 menu label ^Check disc for defects
368 kernel /install/vmlinuz
369- append $KERNEL_PARAMS $FRONTEND_BACKGROUND MENU=/bin/cdrom-checker-menu vga=788 initrd=/install/initrd.gz quiet --
370+ append $KERNEL_PARAMS $FRONTEND_BACKGROUND MENU=/bin/cdrom-checker-menu vga=788 initrd=/install/initrd.gz quiet ---
371 EOF
372 fi
373 if [ "$CDIMAGE_INSTALL_BASE" = 1 ]; then
374@@ -508,7 +508,7 @@
375 label rescue
376 menu label ^Rescue a broken system
377 kernel /install/vmlinuz
378- append $KERNEL_PARAMS $FRONTEND_BACKGROUND rescue/enable=true vga=788 initrd=/install/initrd.gz --
379+ append $KERNEL_PARAMS $FRONTEND_BACKGROUND rescue/enable=true vga=788 initrd=/install/initrd.gz ---
380 EOF
381 fi
382 cat >> boot$N/isolinux/txt.cfg <<EOF
383
384=== modified file 'tools/boot/trusty/post-boot-armel+omap'
385--- tools/boot/trusty/post-boot-armel+omap 2013-10-18 14:52:32 +0000
386+++ tools/boot/trusty/post-boot-armel+omap 2016-02-24 19:25:48 +0000
387@@ -139,7 +139,7 @@
388 uboot_desc="Ubuntu LiveCD"
389 uboot_input_kernel="$CDDIR/casper/filesystem.kernel-$SUBARCH"
390 uboot_input_initrd="$CDDIR/casper/filesystem.initrd-$SUBARCH"
391- uboot_extra_cmdline=" fixrtc quiet splash -- boot=casper only-ubiquity"
392+ uboot_extra_cmdline=" fixrtc quiet splash --- boot=casper only-ubiquity"
393 fi
394
395 if [ "$CDIMAGE_PREINSTALLED" = 1 ]; then

Subscribers

People subscribed via source and target branches