Merge lp:~cyphermox/debian-cd/dash-separator into lp:~ubuntu-cdimage/debian-cd/ubun3

Proposed by Mathieu Trudel-Lapierre on 2015-03-03
Status: Merged
Merged at revision: 1907
Proposed branch: lp:~cyphermox/debian-cd/dash-separator
Merge into: lp:~ubuntu-cdimage/debian-cd/ubun3
Diff against target: 743 lines (+86/-86)
13 files modified
data/vivid/yaboot/yaboot.conf.check (+3/-3)
data/vivid/yaboot/yaboot.conf.check-live (+3/-3)
data/vivid/yaboot/yaboot.conf.cli (+6/-6)
data/vivid/yaboot/yaboot.conf.install (+6/-6)
data/vivid/yaboot/yaboot.conf.live (+9/-9)
data/vivid/yaboot/yaboot.conf.ltsp (+3/-3)
data/vivid/yaboot/yaboot.conf.oem (+3/-3)
data/vivid/yaboot/yaboot.conf.rescue (+3/-3)
data/vivid/yaboot/yaboot.conf.workstation (+3/-3)
tools/boot/vivid/boot-amd64 (+22/-22)
tools/boot/vivid/boot-amd64+mac (+12/-12)
tools/boot/vivid/boot-armel+dove (+1/-1)
tools/boot/vivid/boot-i386 (+12/-12)
To merge this branch: bzr merge lp:~cyphermox/debian-cd/dash-separator
Reviewer Review Type Date Requested Status
Colin Watson 2015-03-03 Approve on 2015-03-03
Review via email: mp+251631@code.launchpad.net

Description of the change

Use three dashes as separator instead of two; this is in line with changes in d-i to use three dashes (---), as well as debian-installer-utils which supports both two- and three- dash separators in user-params.

This fixes OEM, accessibility, and other modes on server and alternate images.

To post a comment you must log in.
Colin Watson (cjwatson) wrote :

Thanks, that all looks sensible. I'll merge.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/vivid/yaboot/yaboot.conf.check'
2--- data/vivid/yaboot/yaboot.conf.check 2014-10-24 20:13:50 +0000
3+++ data/vivid/yaboot/yaboot.conf.check 2015-03-03 17:14:16 +0000
4@@ -4,7 +4,7 @@
5 label=check
6 alias=check-powerpc
7 initrd=/install/powerpc/initrd.gz
8- append="${FRONTEND_BACKGROUND} MENU=/bin/cdrom-checker-menu --"
9+ append="${FRONTEND_BACKGROUND} MENU=/bin/cdrom-checker-menu ---"
10 initrd-size=8192
11 read-only
12
13@@ -12,13 +12,13 @@
14 image[macrisc4]=/install/powerpc64/vmlinux
15 label=check
16 initrd=/install/powerpc64/initrd.gz
17- append="${FRONTEND_BACKGROUND} MENU=/bin/cdrom-checker-menu --"
18+ append="${FRONTEND_BACKGROUND} MENU=/bin/cdrom-checker-menu ---"
19 initrd-size=8192
20 read-only
21
22 image=/install/powerpc64/vmlinux
23 label=check-powerpc64
24 initrd=/install/powerpc64/initrd.gz
25- append="${FRONTEND_BACKGROUND} MENU=/bin/cdrom-checker-menu --"
26+ append="${FRONTEND_BACKGROUND} MENU=/bin/cdrom-checker-menu ---"
27 initrd-size=8192
28 read-only
29
30=== modified file 'data/vivid/yaboot/yaboot.conf.check-live'
31--- data/vivid/yaboot/yaboot.conf.check-live 2014-10-24 20:13:50 +0000
32+++ data/vivid/yaboot/yaboot.conf.check-live 2015-03-03 17:14:16 +0000
33@@ -4,7 +4,7 @@
34 label=check
35 alias=check-powerpc
36 initrd=${CASPER_POWERPC_INITRD}
37- append="boot=casper integrity-check quiet splash --"
38+ append="boot=casper integrity-check quiet splash ---"
39 initrd-size=1048576
40 read-only
41
42@@ -12,13 +12,13 @@
43 image[macrisc4]=/casper/powerpc64/vmlinux
44 label=check
45 initrd=${CASPER_POWERPC64_INITRD}
46- append="boot=casper integrity-check quiet splash --"
47+ append="boot=casper integrity-check quiet splash ---"
48 initrd-size=1048576
49 read-only
50
51 image=/casper/powerpc64/vmlinux
52 label=check-powerpc64
53 initrd=${CASPER_POWERPC64_INITRD}
54- append="boot=casper integrity-check quiet splash --"
55+ append="boot=casper integrity-check quiet splash ---"
56 initrd-size=1048576
57 read-only
58
59=== modified file 'data/vivid/yaboot/yaboot.conf.cli'
60--- data/vivid/yaboot/yaboot.conf.cli 2014-10-24 20:13:50 +0000
61+++ data/vivid/yaboot/yaboot.conf.cli 2015-03-03 17:14:16 +0000
62@@ -4,7 +4,7 @@
63 label=cli
64 alias=cli-powerpc
65 initrd=/install/powerpc/initrd.gz
66- append="${FRONTEND_BACKGROUND} file=/cdrom/preseed/cli.seed --"
67+ append="${FRONTEND_BACKGROUND} file=/cdrom/preseed/cli.seed ---"
68 initrd-size=8192
69 read-only
70
71@@ -12,7 +12,7 @@
72 label=cli-free
73 alias=cli-free-powerpc
74 initrd=/install/powerpc/initrd.gz
75- append="${FRONTEND_BACKGROUND} file=/cdrom/preseed/cli.seed apt-setup/restricted=false apt-setup/multiverse=false --"
76+ append="${FRONTEND_BACKGROUND} file=/cdrom/preseed/cli.seed apt-setup/restricted=false apt-setup/multiverse=false ---"
77 initrd-size=8192
78 read-only
79
80@@ -20,27 +20,27 @@
81 image[macrisc4]=/install/powerpc64/vmlinux
82 label=cli
83 initrd=/install/powerpc64/initrd.gz
84- append="${FRONTEND_BACKGROUND} file=/cdrom/preseed/cli.seed --"
85+ append="${FRONTEND_BACKGROUND} file=/cdrom/preseed/cli.seed ---"
86 initrd-size=8192
87 read-only
88
89 image[macrisc4]=/install/powerpc64/vmlinux
90 label=cli-free
91 initrd=/install/powerpc64/initrd.gz
92- append="${FRONTEND_BACKGROUND} file=/cdrom/preseed/cli.seed apt-setup/restricted=false apt-setup/multiverse=false --"
93+ append="${FRONTEND_BACKGROUND} file=/cdrom/preseed/cli.seed apt-setup/restricted=false apt-setup/multiverse=false ---"
94 initrd-size=8192
95 read-only
96
97 image=/install/powerpc64/vmlinux
98 label=cli-powerpc64
99 initrd=/install/powerpc64/initrd.gz
100- append="${FRONTEND_BACKGROUND} file=/cdrom/preseed/cli.seed --"
101+ append="${FRONTEND_BACKGROUND} file=/cdrom/preseed/cli.seed ---"
102 initrd-size=8192
103 read-only
104
105 image=/install/powerpc64/vmlinux
106 label=cli-free-powerpc64
107 initrd=/install/powerpc64/initrd.gz
108- append="${FRONTEND_BACKGROUND} file=/cdrom/preseed/cli.seed apt-setup/restricted=false apt-setup/multiverse=false --"
109+ append="${FRONTEND_BACKGROUND} file=/cdrom/preseed/cli.seed apt-setup/restricted=false apt-setup/multiverse=false ---"
110 initrd-size=8192
111 read-only
112
113=== modified file 'data/vivid/yaboot/yaboot.conf.install'
114--- data/vivid/yaboot/yaboot.conf.install 2014-10-24 20:13:50 +0000
115+++ data/vivid/yaboot/yaboot.conf.install 2015-03-03 17:14:16 +0000
116@@ -4,7 +4,7 @@
117 label=install
118 alias=install-powerpc
119 initrd=/install/powerpc/initrd.gz
120- append="${DEFAULT_PRESEED} quiet --"
121+ append="${DEFAULT_PRESEED} quiet ---"
122 initrd-size=8192
123 read-only
124
125@@ -12,7 +12,7 @@
126 label=install-free
127 alias=install-free-powerpc
128 initrd=/install/powerpc/initrd.gz
129- append="${DEFAULT_PRESEED} quiet apt-setup/restricted=false apt-setup/multiverse=false --"
130+ append="${DEFAULT_PRESEED} quiet apt-setup/restricted=false apt-setup/multiverse=false ---"
131 initrd-size=8192
132 read-only
133
134@@ -20,27 +20,27 @@
135 image[macrisc4]=/install/powerpc64/vmlinux
136 label=install
137 initrd=/install/powerpc64/initrd.gz
138- append="${DEFAULT_PRESEED} quiet --"
139+ append="${DEFAULT_PRESEED} quiet ---"
140 initrd-size=8192
141 read-only
142
143 image[macrisc4]=/install/powerpc64/vmlinux
144 label=install-free
145 initrd=/install/powerpc64/initrd.gz
146- append="${DEFAULT_PRESEED} quiet apt-setup/restricted=false apt-setup/multiverse=false --"
147+ append="${DEFAULT_PRESEED} quiet apt-setup/restricted=false apt-setup/multiverse=false ---"
148 initrd-size=8192
149 read-only
150
151 image=/install/powerpc64/vmlinux
152 label=install-powerpc64
153 initrd=/install/powerpc64/initrd.gz
154- append="${DEFAULT_PRESEED} quiet --"
155+ append="${DEFAULT_PRESEED} quiet ---"
156 initrd-size=8192
157 read-only
158
159 image=/install/powerpc64/vmlinux
160 label=install-free-powerpc64
161 initrd=/install/powerpc64/initrd.gz
162- append="${DEFAULT_PRESEED} quiet apt-setup/restricted=false apt-setup/multiverse=false --"
163+ append="${DEFAULT_PRESEED} quiet apt-setup/restricted=false apt-setup/multiverse=false ---"
164 initrd-size=8192
165 read-only
166
167=== modified file 'data/vivid/yaboot/yaboot.conf.live'
168--- data/vivid/yaboot/yaboot.conf.live 2014-10-24 20:13:50 +0000
169+++ data/vivid/yaboot/yaboot.conf.live 2015-03-03 17:14:16 +0000
170@@ -4,7 +4,7 @@
171 label=live
172 alias=live-powerpc
173 initrd=${CASPER_POWERPC_INITRD}
174- append="${DEFAULT_PRESEED} boot=casper quiet splash --"
175+ append="${DEFAULT_PRESEED} boot=casper quiet splash ---"
176 initrd-size=1048576
177 read-only
178
179@@ -12,7 +12,7 @@
180 label=live-nosplash
181 alias=live-nosplash-powerpc
182 initrd=${CASPER_POWERPC_INITRD}
183- append="${DEFAULT_PRESEED} boot=casper quiet --"
184+ append="${DEFAULT_PRESEED} boot=casper quiet ---"
185 initrd-size=1048576
186 read-only
187
188@@ -20,7 +20,7 @@
189 label=driverupdates
190 alias=driverupdates-powerpc
191 initrd=${CASPER_POWERPC_INITRD}
192- append="${DEFAULT_PRESEED} boot=casper debian-installer/driver-update=true quiet splash --"
193+ append="${DEFAULT_PRESEED} boot=casper debian-installer/driver-update=true quiet splash ---"
194 initrd-size=1048576
195 read-only
196
197@@ -28,41 +28,41 @@
198 image[macrisc4]=/casper/powerpc64/vmlinux
199 label=live
200 initrd=${CASPER_POWERPC64_INITRD}
201- append="${DEFAULT_PRESEED} boot=casper quiet splash --"
202+ append="${DEFAULT_PRESEED} boot=casper quiet splash ---"
203 initrd-size=1048576
204 read-only
205
206 image[macrisc4]=/casper/powerpc64/vmlinux
207 label=live-nosplash
208 initrd=${CASPER_POWERPC64_INITRD}
209- append="${DEFAULT_PRESEED} boot=casper quiet --"
210+ append="${DEFAULT_PRESEED} boot=casper quiet ---"
211 initrd-size=1048576
212 read-only
213
214 image[macrisc4]=/casper/powerpc64/vmlinux
215 label=driverupdates
216 initrd=${CASPER_POWERPC64_INITRD}
217- append="${DEFAULT_PRESEED} boot=casper debian-installer/driver-update=true quiet splash --"
218+ append="${DEFAULT_PRESEED} boot=casper debian-installer/driver-update=true quiet splash ---"
219 initrd-size=1048576
220 read-only
221
222 image=/casper/powerpc64/vmlinux
223 label=live-powerpc64
224 initrd=${CASPER_POWERPC64_INITRD}
225- append="${DEFAULT_PRESEED} boot=casper quiet splash --"
226+ append="${DEFAULT_PRESEED} boot=casper quiet splash ---"
227 initrd-size=1048576
228 read-only
229
230 image=/casper/powerpc64/vmlinux
231 label=live-nosplash-powerpc64
232 initrd=${CASPER_POWERPC64_INITRD}
233- append="${DEFAULT_PRESEED} boot=casper quiet --"
234+ append="${DEFAULT_PRESEED} boot=casper quiet ---"
235 initrd-size=1048576
236 read-only
237
238 image=/casper/powerpc64/vmlinux
239 label=driverupdates-powerpc64
240 initrd=${CASPER_POWERPC64_INITRD}
241- append="${DEFAULT_PRESEED} boot=casper debian-installer/driver-update=true quiet splash --"
242+ append="${DEFAULT_PRESEED} boot=casper debian-installer/driver-update=true quiet splash ---"
243 initrd-size=1048576
244 read-only
245
246=== modified file 'data/vivid/yaboot/yaboot.conf.ltsp'
247--- data/vivid/yaboot/yaboot.conf.ltsp 2014-10-24 20:13:50 +0000
248+++ data/vivid/yaboot/yaboot.conf.ltsp 2015-03-03 17:14:16 +0000
249@@ -4,7 +4,7 @@
250 label=ltsp-server
251 alias=ltsp-server-powerpc
252 initrd=/install/powerpc/initrd.gz
253- append="${FRONTEND_BACKGROUND} file=/cdrom/preseed/ltsp.seed --"
254+ append="${FRONTEND_BACKGROUND} file=/cdrom/preseed/ltsp.seed ---"
255 initrd-size=8192
256 read-only
257
258@@ -12,13 +12,13 @@
259 image[macrisc4]=/install/powerpc64/vmlinux
260 label=ltsp-server
261 initrd=/install/powerpc64/initrd.gz
262- append="${FRONTEND_BACKGROUND} file=/cdrom/preseed/ltsp.seed --"
263+ append="${FRONTEND_BACKGROUND} file=/cdrom/preseed/ltsp.seed ---"
264 initrd-size=8192
265 read-only
266
267 image=/install/powerpc64/vmlinux
268 label=ltsp-server-powerpc64
269 initrd=/install/powerpc64/initrd.gz
270- append="${FRONTEND_BACKGROUND} file=/cdrom/preseed/ltsp.seed --"
271+ append="${FRONTEND_BACKGROUND} file=/cdrom/preseed/ltsp.seed ---"
272 initrd-size=8192
273 read-only
274
275=== modified file 'data/vivid/yaboot/yaboot.conf.oem'
276--- data/vivid/yaboot/yaboot.conf.oem 2014-10-24 20:13:50 +0000
277+++ data/vivid/yaboot/yaboot.conf.oem 2015-03-03 17:14:16 +0000
278@@ -4,7 +4,7 @@
279 label=oem
280 alias=oem-powerpc
281 initrd=/install/powerpc/initrd.gz
282- append="${DEFAULT_PRESEED} oem-config/enable=true quiet --"
283+ append="${DEFAULT_PRESEED} oem-config/enable=true quiet ---"
284 initrd-size=8192
285 read-only
286
287@@ -12,13 +12,13 @@
288 image[macrisc4]=/install/powerpc64/vmlinux
289 label=oem
290 initrd=/install/powerpc64/initrd.gz
291- append="${DEFAULT_PRESEED} oem-config/enable=true quiet --"
292+ append="${DEFAULT_PRESEED} oem-config/enable=true quiet ---"
293 initrd-size=8192
294 read-only
295
296 image=/install/powerpc64/vmlinux
297 label=oem-powerpc64
298 initrd=/install/powerpc64/initrd.gz
299- append="${DEFAULT_PRESEED} oem-config/enable=true quiet --"
300+ append="${DEFAULT_PRESEED} oem-config/enable=true quiet ---"
301 initrd-size=8192
302 read-only
303
304=== modified file 'data/vivid/yaboot/yaboot.conf.rescue'
305--- data/vivid/yaboot/yaboot.conf.rescue 2014-10-24 20:13:50 +0000
306+++ data/vivid/yaboot/yaboot.conf.rescue 2015-03-03 17:14:16 +0000
307@@ -4,7 +4,7 @@
308 label=rescue
309 alias=rescue-powerpc
310 initrd=/install/powerpc/initrd.gz
311- append="${FRONTEND_BACKGROUND} rescue/enable=true --"
312+ append="${FRONTEND_BACKGROUND} rescue/enable=true ---"
313 initrd-size=8192
314 read-only
315
316@@ -12,13 +12,13 @@
317 image[macrisc4]=/install/powerpc64/vmlinux
318 label=rescue
319 initrd=/install/powerpc64/initrd.gz
320- append="${FRONTEND_BACKGROUND} rescue/enable=true --"
321+ append="${FRONTEND_BACKGROUND} rescue/enable=true ---"
322 initrd-size=8192
323 read-only
324
325 image=/install/powerpc64/vmlinux
326 label=rescue-powerpc64
327 initrd=/install/powerpc64/initrd.gz
328- append="${FRONTEND_BACKGROUND} rescue/enable=true --"
329+ append="${FRONTEND_BACKGROUND} rescue/enable=true ---"
330 initrd-size=8192
331 read-only
332
333=== modified file 'data/vivid/yaboot/yaboot.conf.workstation'
334--- data/vivid/yaboot/yaboot.conf.workstation 2014-10-24 20:13:50 +0000
335+++ data/vivid/yaboot/yaboot.conf.workstation 2015-03-03 17:14:16 +0000
336@@ -4,7 +4,7 @@
337 label=workstation
338 alias=workstation-powerpc
339 initrd=/install/powerpc/initrd.gz
340- append="${FRONTEND_BACKGROUND} file=/cdrom/preseed/workstation.seed quiet --"
341+ append="${FRONTEND_BACKGROUND} file=/cdrom/preseed/workstation.seed quiet ---"
342 initrd-size=8192
343 read-only
344
345@@ -12,13 +12,13 @@
346 image[macrisc4]=/install/powerpc64/vmlinux
347 label=workstation
348 initrd=/install/powerpc64/initrd.gz
349- append="${FRONTEND_BACKGROUND} file=/cdrom/preseed/workstation.seed quiet --"
350+ append="${FRONTEND_BACKGROUND} file=/cdrom/preseed/workstation.seed quiet ---"
351 initrd-size=8192
352 read-only
353
354 image=/install/powerpc64/vmlinux
355 label=workstation-powerpc64
356 initrd=/install/powerpc64/initrd.gz
357- append="${FRONTEND_BACKGROUND} file=/cdrom/preseed/workstation.seed quiet --"
358+ append="${FRONTEND_BACKGROUND} file=/cdrom/preseed/workstation.seed quiet ---"
359 initrd-size=8192
360 read-only
361
362=== modified file 'tools/boot/vivid/boot-amd64'
363--- tools/boot/vivid/boot-amd64 2015-01-12 15:59:57 +0000
364+++ tools/boot/vivid/boot-amd64 2015-03-03 17:14:16 +0000
365@@ -382,19 +382,19 @@
366 label live
367 menu label $livelabel
368 kernel $CASPER_KERNEL
369- append $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper$liveparams initrd=$CASPER_INITRD quiet splash --
370+ append $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper$liveparams initrd=$CASPER_INITRD quiet splash ---
371 EOF
372 cat >> $CDDIR/boot/grub/grub.cfg <<EOF
373 menuentry "${livelabel#^}" {
374 set gfxpayload=keep
375- linux $CASPER_KERNEL $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper$liveparams quiet splash --
376+ linux $CASPER_KERNEL $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper$liveparams quiet splash ---
377 initrd $CASPER_INITRD
378 }
379 EOF
380 cat >> $CDDIR/boot/grub/loopback.cfg <<EOF
381 menuentry "${livelabel#^}" {
382 set gfxpayload=keep
383- linux $CASPER_KERNEL $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper$liveparams iso-scan/filename=\${iso_path} quiet splash --
384+ linux $CASPER_KERNEL $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper$liveparams iso-scan/filename=\${iso_path} quiet splash ---
385 initrd $CASPER_INITRD
386 }
387 EOF
388@@ -403,18 +403,18 @@
389 label live-install
390 menu label ^Install $HUMANPROJECT
391 kernel $CASPER_KERNEL
392- append $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper only-ubiquity initrd=$CASPER_INITRD quiet splash --
393+ append $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper only-ubiquity initrd=$CASPER_INITRD quiet splash ---
394 EOF
395 cat >> $CDDIR/boot/grub/grub.cfg <<EOF
396 menuentry "Install $HUMANPROJECT" {
397 set gfxpayload=keep
398- linux $CASPER_KERNEL $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper only-ubiquity quiet splash --
399+ linux $CASPER_KERNEL $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper only-ubiquity quiet splash ---
400 initrd $CASPER_INITRD
401 }
402 EOF
403 cat >> $CDDIR/boot/grub/loopback.cfg <<EOF
404 menuentry "Install $HUMANPROJECT" {
405- linux $CASPER_KERNEL $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper only-ubiquity iso-scan/filename=\${iso_path} quiet splash --
406+ linux $CASPER_KERNEL $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper only-ubiquity iso-scan/filename=\${iso_path} quiet splash ---
407 initrd $CASPER_INITRD
408 }
409 EOF
410@@ -431,12 +431,12 @@
411 label install
412 menu label ^Install $HUMANPROJECT
413 kernel /install/vmlinuz
414- append $KERNEL_PARAMS $DEFAULT_PRESEED vga=788 initrd=/install/initrd.gz quiet --
415+ append $KERNEL_PARAMS $DEFAULT_PRESEED vga=788 initrd=/install/initrd.gz quiet ---
416 EOF
417 cat >> $CDDIR/boot/grub/grub.cfg <<EOF
418 menuentry "Install $HUMANPROJECT" {
419 set gfxpayload=keep
420- linux /install/vmlinuz $KERNEL_PARAMS $DEFAULT_PRESEED quiet --
421+ linux /install/vmlinuz $KERNEL_PARAMS $DEFAULT_PRESEED quiet ---
422 initrd /install/initrd.gz
423 }
424 EOF
425@@ -445,12 +445,12 @@
426 label install
427 menu label ^Install $HUMANPROJECT in text mode
428 kernel /install/vmlinuz
429- append $KERNEL_PARAMS $DEFAULT_PRESEED vga=788 initrd=/install/initrd.gz quiet --
430+ append $KERNEL_PARAMS $DEFAULT_PRESEED vga=788 initrd=/install/initrd.gz quiet ---
431 EOF
432 cat >> $CDDIR/boot/grub/grub.cfg <<EOF
433 menuentry "Install $HUMANPROJECT in text mode" {
434 set gfxpayload=keep
435- linux /install/vmlinuz $KERNEL_PARAMS $DEFAULT_PRESEED quiet --
436+ linux /install/vmlinuz $KERNEL_PARAMS $DEFAULT_PRESEED quiet ---
437 initrd /install/initrd.gz
438 }
439 EOF
440@@ -459,7 +459,7 @@
441 label expert
442 menu hide
443 kernel /install/vmlinuz
444- append $KERNEL_PARAMS $DEFAULT_PRESEED priority=low vga=788 initrd=/install/initrd.gz --
445+ append $KERNEL_PARAMS $DEFAULT_PRESEED priority=low vga=788 initrd=/install/initrd.gz ---
446 EOF
447 if [ "$PROJECT" = edubuntu ]; then
448 cat >> boot$N/isolinux/gfxboot.cfg <<EOF
449@@ -491,7 +491,7 @@
450 cat >> $CDDIR/boot/grub/grub.cfg <<EOF
451 menuentry "OEM install (for manufacturers)" {
452 set gfxpayload=keep
453- linux $CASPER_KERNEL $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper only-ubiquity quiet splash oem-config/enable=true --
454+ linux $CASPER_KERNEL $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper only-ubiquity quiet splash oem-config/enable=true ---
455 initrd $CASPER_INITRD
456 }
457 EOF
458@@ -502,7 +502,7 @@
459 cat >> $CDDIR/boot/grub/grub.cfg <<EOF
460 menuentry "OEM install (for manufacturers)" {
461 set gfxpayload=keep
462- linux /install/vmlinuz $KERNEL_PARAMS $DEFAULT_PRESEED quiet oem-config/enable=true --
463+ linux /install/vmlinuz $KERNEL_PARAMS $DEFAULT_PRESEED quiet oem-config/enable=true ---
464 initrd /install/initrd.gz
465 }
466 EOF
467@@ -529,12 +529,12 @@
468 label cloud
469 menu label ^Multiple server install with MAAS
470 kernel /install/vmlinuz
471- append $KERNEL_PARAMS $FRONTEND_BACKGROUND modules=maas-enlist-udeb vga=788 initrd=/install/initrd.gz quiet --
472+ append $KERNEL_PARAMS $FRONTEND_BACKGROUND modules=maas-enlist-udeb vga=788 initrd=/install/initrd.gz quiet ---
473 EOF
474 cat >> $CDDIR/boot/grub/grub.cfg <<EOF
475 menuentry "Multiple server install with MAAS" {
476 set gfxpayload=keep
477- linux /install/vmlinuz $KERNEL_PARAMS modules=maas-enlist-udeb vga=788 initrd=/install/initrd.gz quiet --
478+ linux /install/vmlinuz $KERNEL_PARAMS modules=maas-enlist-udeb vga=788 initrd=/install/initrd.gz quiet ---
479 initrd /install/initrd.gz
480 }
481 EOF
482@@ -559,18 +559,18 @@
483 label check
484 menu label ^Check disc for defects
485 kernel $CASPER_KERNEL
486- append $KERNEL_PARAMS boot=casper integrity-check initrd=$CASPER_INITRD quiet splash --
487+ append $KERNEL_PARAMS boot=casper integrity-check initrd=$CASPER_INITRD quiet splash ---
488 EOF
489 cat >> $CDDIR/boot/grub/grub.cfg <<EOF
490 menuentry "Check disc for defects" {
491 set gfxpayload=keep
492- linux $CASPER_KERNEL $KERNEL_PARAMS boot=casper integrity-check quiet splash --
493+ linux $CASPER_KERNEL $KERNEL_PARAMS boot=casper integrity-check quiet splash ---
494 initrd $CASPER_INITRD
495 }
496 EOF
497 cat >> $CDDIR/boot/grub/loopback.cfg <<EOF
498 menuentry "Check disc for defects" {
499- linux $CASPER_KERNEL $KERNEL_PARAMS boot=casper integrity-check iso-scan/filename=\${iso_path} quiet splash --
500+ linux $CASPER_KERNEL $KERNEL_PARAMS boot=casper integrity-check iso-scan/filename=\${iso_path} quiet splash ---
501 initrd $CASPER_INITRD
502 }
503 EOF
504@@ -579,12 +579,12 @@
505 label check
506 menu label ^Check disc for defects
507 kernel /install/vmlinuz
508- append $KERNEL_PARAMS $FRONTEND_BACKGROUND MENU=/bin/cdrom-checker-menu vga=788 initrd=/install/initrd.gz quiet --
509+ append $KERNEL_PARAMS $FRONTEND_BACKGROUND MENU=/bin/cdrom-checker-menu vga=788 initrd=/install/initrd.gz quiet ---
510 EOF
511 cat >> $CDDIR/boot/grub/grub.cfg <<EOF
512 menuentry "Check disc for defects" {
513 set gfxpayload=keep
514- linux /install/vmlinuz $KERNEL_PARAMS MENU=/bin/cdrom-checker-menu quiet --
515+ linux /install/vmlinuz $KERNEL_PARAMS MENU=/bin/cdrom-checker-menu quiet ---
516 initrd /install/initrd.gz
517 }
518 EOF
519@@ -594,12 +594,12 @@
520 label rescue
521 menu label ^Rescue a broken system
522 kernel /install/vmlinuz
523- append $KERNEL_PARAMS $FRONTEND_BACKGROUND rescue/enable=true vga=788 initrd=/install/initrd.gz --
524+ append $KERNEL_PARAMS $FRONTEND_BACKGROUND rescue/enable=true vga=788 initrd=/install/initrd.gz ---
525 EOF
526 cat >> $CDDIR/boot/grub/grub.cfg <<EOF
527 menuentry "Rescue a broken system" {
528 set gfxpayload=keep
529- linux /install/vmlinuz $KERNEL_PARAMS rescue/enable=true --
530+ linux /install/vmlinuz $KERNEL_PARAMS rescue/enable=true ---
531 initrd /install/initrd.gz
532 }
533 EOF
534
535=== modified file 'tools/boot/vivid/boot-amd64+mac'
536--- tools/boot/vivid/boot-amd64+mac 2015-02-04 14:27:21 +0000
537+++ tools/boot/vivid/boot-amd64+mac 2015-03-03 17:14:16 +0000
538@@ -357,12 +357,12 @@
539 label live
540 menu label $livelabel
541 kernel /casper/vmlinuz
542- append $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper$liveparams initrd=$CASPER_INITRD quiet splash --
543+ append $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper$liveparams initrd=$CASPER_INITRD quiet splash ---
544 EOF
545 cat >> $CDDIR/boot/grub/loopback.cfg <<EOF
546 menuentry "${livelabel#^}" {
547 set gfxpayload=keep
548- linux /casper/vmlinuz $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper$liveparams iso-scan/filename=\${iso_path} quiet splash --
549+ linux /casper/vmlinuz $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper$liveparams iso-scan/filename=\${iso_path} quiet splash ---
550 initrd $CASPER_INITRD
551 }
552 EOF
553@@ -371,11 +371,11 @@
554 label live-install
555 menu label ^Install $HUMANPROJECT
556 kernel /casper/vmlinuz
557- append $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper only-ubiquity initrd=$CASPER_INITRD quiet splash --
558+ append $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper only-ubiquity initrd=$CASPER_INITRD quiet splash ---
559 EOF
560 cat >> $CDDIR/boot/grub/loopback.cfg <<EOF
561 menuentry "Install $HUMANPROJECT" {
562- linux /casper/vmlinuz $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper only-ubiquity iso-scan/filename=\${iso_path} quiet splash --
563+ linux /casper/vmlinuz $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper only-ubiquity iso-scan/filename=\${iso_path} quiet splash ---
564 initrd $CASPER_INITRD
565 }
566 EOF
567@@ -392,21 +392,21 @@
568 label install
569 menu label ^Install $HUMANPROJECT
570 kernel /install/vmlinuz
571- append $KERNEL_PARAMS $DEFAULT_PRESEED vga=788 initrd=/install/initrd.gz quiet --
572+ append $KERNEL_PARAMS $DEFAULT_PRESEED vga=788 initrd=/install/initrd.gz quiet ---
573 EOF
574 else
575 cat >> boot$N/isolinux/txt.cfg <<EOF
576 label install
577 menu label ^Install $HUMANPROJECT in text mode
578 kernel /install/vmlinuz
579- append $KERNEL_PARAMS $DEFAULT_PRESEED vga=788 initrd=/install/initrd.gz quiet --
580+ append $KERNEL_PARAMS $DEFAULT_PRESEED vga=788 initrd=/install/initrd.gz quiet ---
581 EOF
582 fi
583 cat >> boot$N/isolinux/adtxt.cfg <<EOF
584 label expert
585 menu hide
586 kernel /install/vmlinuz
587- append $KERNEL_PARAMS $DEFAULT_PRESEED priority=low vga=788 initrd=/install/initrd.gz --
588+ append $KERNEL_PARAMS $DEFAULT_PRESEED priority=low vga=788 initrd=/install/initrd.gz ---
589 EOF
590 if [ "$PROJECT" = edubuntu ]; then
591 cat >> boot$N/isolinux/gfxboot.cfg <<EOF
592@@ -458,7 +458,7 @@
593 label cloud
594 menu label ^Multiple server install with MAAS
595 kernel /install/vmlinuz
596- append $KERNEL_PARAMS $FRONTEND_BACKGROUND modules=maas-enlist-udeb vga=788 initrd=/install/initrd.gz quiet --
597+ append $KERNEL_PARAMS $FRONTEND_BACKGROUND modules=maas-enlist-udeb vga=788 initrd=/install/initrd.gz quiet ---
598 EOF
599 fi
600 fi
601@@ -481,11 +481,11 @@
602 label check
603 menu label ^Check disc for defects
604 kernel /casper/vmlinuz
605- append $KERNEL_PARAMS boot=casper integrity-check initrd=$CASPER_INITRD quiet splash --
606+ append $KERNEL_PARAMS boot=casper integrity-check initrd=$CASPER_INITRD quiet splash ---
607 EOF
608 cat >> $CDDIR/boot/grub/loopback.cfg <<EOF
609 menuentry "Check disc for defects" {
610- linux /casper/vmlinuz $KERNEL_PARAMS boot=casper integrity-check iso-scan/filename=\${iso_path} quiet splash --
611+ linux /casper/vmlinuz $KERNEL_PARAMS boot=casper integrity-check iso-scan/filename=\${iso_path} quiet splash ---
612 initrd $CASPER_INITRD
613 }
614 EOF
615@@ -494,7 +494,7 @@
616 label check
617 menu label ^Check disc for defects
618 kernel /install/vmlinuz
619- append $KERNEL_PARAMS $FRONTEND_BACKGROUND MENU=/bin/cdrom-checker-menu vga=788 initrd=/install/initrd.gz quiet --
620+ append $KERNEL_PARAMS $FRONTEND_BACKGROUND MENU=/bin/cdrom-checker-menu vga=788 initrd=/install/initrd.gz quiet ---
621 EOF
622 fi
623 if [ "$CDIMAGE_INSTALL_BASE" = 1 ]; then
624@@ -502,7 +502,7 @@
625 label rescue
626 menu label ^Rescue a broken system
627 kernel /install/vmlinuz
628- append $KERNEL_PARAMS $FRONTEND_BACKGROUND rescue/enable=true vga=788 initrd=/install/initrd.gz --
629+ append $KERNEL_PARAMS $FRONTEND_BACKGROUND rescue/enable=true vga=788 initrd=/install/initrd.gz ---
630 EOF
631 fi
632 cat >> boot$N/isolinux/txt.cfg <<EOF
633
634=== modified file 'tools/boot/vivid/boot-armel+dove'
635--- tools/boot/vivid/boot-armel+dove 2014-10-24 20:13:50 +0000
636+++ tools/boot/vivid/boot-armel+dove 2015-03-03 17:14:16 +0000
637@@ -119,7 +119,7 @@
638 uboot_input_initrd="$CDDIR/casper/filesystem.initrd-$FLAVOUR"
639 uboot_kernel="/casper/uImage"
640 uboot_initrd="/casper/uInitrd"
641- uboot_extra_cmdline=" -- boot=casper"
642+ uboot_extra_cmdline=" --- boot=casper"
643 fi
644
645 if [ "$do_uboot" ]; then
646
647=== modified file 'tools/boot/vivid/boot-i386'
648--- tools/boot/vivid/boot-i386 2015-02-04 14:27:21 +0000
649+++ tools/boot/vivid/boot-i386 2015-03-03 17:14:16 +0000
650@@ -362,11 +362,11 @@
651 label live
652 menu label $livelabel
653 kernel /casper/vmlinuz
654- append $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper$liveparams initrd=$CASPER_INITRD quiet splash --
655+ append $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper$liveparams initrd=$CASPER_INITRD quiet splash ---
656 EOF
657 cat >> $CDDIR/boot/grub/loopback.cfg <<EOF
658 menuentry "${livelabel#^}" {
659- linux /casper/vmlinuz $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper$liveparams iso-scan/filename=\${iso_path} quiet splash --
660+ linux /casper/vmlinuz $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper$liveparams iso-scan/filename=\${iso_path} quiet splash ---
661 initrd $CASPER_INITRD
662 }
663 EOF
664@@ -375,11 +375,11 @@
665 label live-install
666 menu label ^Install $HUMANPROJECT
667 kernel /casper/vmlinuz
668- append $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper only-ubiquity initrd=$CASPER_INITRD quiet splash --
669+ append $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper only-ubiquity initrd=$CASPER_INITRD quiet splash ---
670 EOF
671 cat >> $CDDIR/boot/grub/loopback.cfg <<EOF
672 menuentry "Install $HUMANPROJECT" {
673- linux /casper/vmlinuz $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper only-ubiquity iso-scan/filename=\${iso_path} quiet splash --
674+ linux /casper/vmlinuz $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper only-ubiquity iso-scan/filename=\${iso_path} quiet splash ---
675 initrd $CASPER_INITRD
676 }
677 EOF
678@@ -396,21 +396,21 @@
679 label install
680 menu label ^Install $HUMANPROJECT
681 kernel /install/vmlinuz
682- append $KERNEL_PARAMS $DEFAULT_PRESEED vga=788 initrd=/install/initrd.gz quiet --
683+ append $KERNEL_PARAMS $DEFAULT_PRESEED vga=788 initrd=/install/initrd.gz quiet ---
684 EOF
685 else
686 cat >> boot$N/isolinux/txt.cfg <<EOF
687 label install
688 menu label ^Install $HUMANPROJECT in text mode
689 kernel /install/vmlinuz
690- append $KERNEL_PARAMS $DEFAULT_PRESEED vga=788 initrd=/install/initrd.gz quiet --
691+ append $KERNEL_PARAMS $DEFAULT_PRESEED vga=788 initrd=/install/initrd.gz quiet ---
692 EOF
693 fi
694 cat >> boot$N/isolinux/adtxt.cfg <<EOF
695 label expert
696 menu hide
697 kernel /install/vmlinuz
698- append $KERNEL_PARAMS $DEFAULT_PRESEED priority=low vga=788 initrd=/install/initrd.gz --
699+ append $KERNEL_PARAMS $DEFAULT_PRESEED priority=low vga=788 initrd=/install/initrd.gz ---
700 EOF
701 if [ "$PROJECT" = edubuntu ]; then
702 cat >> boot$N/isolinux/gfxboot.cfg <<EOF
703@@ -462,7 +462,7 @@
704 label cloud
705 menu label ^Multiple server install with MAAS
706 kernel /install/vmlinuz
707- append $KERNEL_PARAMS $FRONTEND_BACKGROUND modules=maas-enlist-udeb vga=788 initrd=/install/initrd.gz quiet --
708+ append $KERNEL_PARAMS $FRONTEND_BACKGROUND modules=maas-enlist-udeb vga=788 initrd=/install/initrd.gz quiet ---
709 EOF
710 fi
711 fi
712@@ -485,11 +485,11 @@
713 label check
714 menu label ^Check disc for defects
715 kernel /casper/vmlinuz
716- append $KERNEL_PARAMS boot=casper integrity-check initrd=$CASPER_INITRD quiet splash --
717+ append $KERNEL_PARAMS boot=casper integrity-check initrd=$CASPER_INITRD quiet splash ---
718 EOF
719 cat >> $CDDIR/boot/grub/loopback.cfg <<EOF
720 menuentry "Check disc for defects" {
721- linux /casper/vmlinuz $KERNEL_PARAMS boot=casper integrity-check iso-scan/filename=\${iso_path} quiet splash --
722+ linux /casper/vmlinuz $KERNEL_PARAMS boot=casper integrity-check iso-scan/filename=\${iso_path} quiet splash ---
723 initrd $CASPER_INITRD
724 }
725 EOF
726@@ -498,7 +498,7 @@
727 label check
728 menu label ^Check disc for defects
729 kernel /install/vmlinuz
730- append $KERNEL_PARAMS $FRONTEND_BACKGROUND MENU=/bin/cdrom-checker-menu vga=788 initrd=/install/initrd.gz quiet --
731+ append $KERNEL_PARAMS $FRONTEND_BACKGROUND MENU=/bin/cdrom-checker-menu vga=788 initrd=/install/initrd.gz quiet ---
732 EOF
733 fi
734 if [ "$CDIMAGE_INSTALL_BASE" = 1 ]; then
735@@ -506,7 +506,7 @@
736 label rescue
737 menu label ^Rescue a broken system
738 kernel /install/vmlinuz
739- append $KERNEL_PARAMS $FRONTEND_BACKGROUND rescue/enable=true vga=788 initrd=/install/initrd.gz --
740+ append $KERNEL_PARAMS $FRONTEND_BACKGROUND rescue/enable=true vga=788 initrd=/install/initrd.gz ---
741 EOF
742 fi
743 cat >> boot$N/isolinux/txt.cfg <<EOF

Subscribers

People subscribed via source and target branches