debian-cd

Merge lp:~xnox/debian-cd/drop-boot-casper into lp:~ubuntu-cdimage/debian-cd/ubun3

  1. drop-boot-casper
  2. Merge into ubun3
Proposed by Dimitri John Ledkov
Status: Merged
Merged at revision: 2027
Proposed branch: lp:~xnox/debian-cd/drop-boot-casper
Merge into: lp:~ubuntu-cdimage/debian-cd/ubun3
Diff against target: 402 lines (+45/-45)
10 files modified
data/eoan/yaboot/yaboot.conf.check-live (+3/-3)
data/eoan/yaboot/yaboot.conf.live (+9/-9)
tools/boot/eoan/boot-amd64 (+10/-10)
tools/boot/eoan/boot-amd64+mac (+6/-6)
tools/boot/eoan/boot-arm64 (+7/-7)
tools/boot/eoan/boot-armel+dove (+1/-1)
tools/boot/eoan/boot-i386 (+6/-6)
tools/boot/eoan/boot-ppc64el (+1/-1)
tools/boot/eoan/boot-s390x (+1/-1)
tools/boot/eoan/post-boot-armel+omap (+1/-1)
To merge this branch: bzr merge lp:~xnox/debian-cd/drop-boot-casper
Reviewer Review Type Date Requested Status
Steve Langasek Approve
Review via email: mp+366448@code.launchpad.net

Commit message

  eoan: drop boot=casper args in all the live images.

  When casper initrd is generated with CASPER_GENERATE_UUID, in eoan it
  now also generates a conf.d snippet to default to boot=casper if not
  otherwise set. This removes boilerplate from all of our default
  installer boot entries.

Description of the change

  eoan: drop boot=casper args in all the live images.

  When casper initrd is generated with CASPER_GENERATE_UUID, in eoan it
  now also generates a conf.d snippet to default to boot=casper if not
  otherwise set. This removes boilerplate from all of our default
  installer boot entries.

To post a comment you must log in.
Revision history for this message
Dimitri John Ledkov (xnox) wrote :

The corresponding casper change is

http://launchpadlibrarian.net/420743378/casper_1.405_1.406.diff.gz

And today's dailies do boot to the live system, only-ubiquity, maybe-ubiquity even when one edits the kernel command line to drop boot=casper arg.

Revision history for this message
Steve Langasek (vorlon) wrote :

Elegant.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'data/eoan/yaboot/yaboot.conf.check-live'
--- data/eoan/yaboot/yaboot.conf.check-live 2019-04-20 08:07:06 +0000
+++ data/eoan/yaboot/yaboot.conf.check-live 2019-04-24 11:48:21 +0000
@@ -4,7 +4,7 @@
4 label=check4 label=check
5 alias=check-powerpc5 alias=check-powerpc
6 initrd=${CASPER_POWERPC_INITRD}6 initrd=${CASPER_POWERPC_INITRD}
7 append="boot=casper integrity-check quiet splash ---"7 append="integrity-check quiet splash ---"
8 initrd-size=10485768 initrd-size=1048576
9 read-only9 read-only
1010
@@ -12,13 +12,13 @@
12image[macrisc4]=/casper/powerpc64/vmlinux12image[macrisc4]=/casper/powerpc64/vmlinux
13 label=check13 label=check
14 initrd=${CASPER_POWERPC64_INITRD}14 initrd=${CASPER_POWERPC64_INITRD}
15 append="boot=casper integrity-check quiet splash ---"15 append="integrity-check quiet splash ---"
16 initrd-size=104857616 initrd-size=1048576
17 read-only17 read-only
1818
19image=/casper/powerpc64/vmlinux19image=/casper/powerpc64/vmlinux
20 label=check-powerpc6420 label=check-powerpc64
21 initrd=${CASPER_POWERPC64_INITRD}21 initrd=${CASPER_POWERPC64_INITRD}
22 append="boot=casper integrity-check quiet splash ---"22 append="integrity-check quiet splash ---"
23 initrd-size=104857623 initrd-size=1048576
24 read-only24 read-only
2525
=== modified file 'data/eoan/yaboot/yaboot.conf.live'
--- data/eoan/yaboot/yaboot.conf.live 2019-04-20 08:07:06 +0000
+++ data/eoan/yaboot/yaboot.conf.live 2019-04-24 11:48:21 +0000
@@ -4,7 +4,7 @@
4 label=live4 label=live
5 alias=live-powerpc5 alias=live-powerpc
6 initrd=${CASPER_POWERPC_INITRD}6 initrd=${CASPER_POWERPC_INITRD}
7 append="${DEFAULT_PRESEED} boot=casper quiet splash ---"7 append="${DEFAULT_PRESEED} quiet splash ---"
8 initrd-size=10485768 initrd-size=1048576
9 read-only9 read-only
1010
@@ -12,7 +12,7 @@
12 label=live-nosplash12 label=live-nosplash
13 alias=live-nosplash-powerpc13 alias=live-nosplash-powerpc
14 initrd=${CASPER_POWERPC_INITRD}14 initrd=${CASPER_POWERPC_INITRD}
15 append="${DEFAULT_PRESEED} boot=casper quiet ---"15 append="${DEFAULT_PRESEED} quiet ---"
16 initrd-size=104857616 initrd-size=1048576
17 read-only17 read-only
1818
@@ -20,7 +20,7 @@
20 label=driverupdates20 label=driverupdates
21 alias=driverupdates-powerpc21 alias=driverupdates-powerpc
22 initrd=${CASPER_POWERPC_INITRD}22 initrd=${CASPER_POWERPC_INITRD}
23 append="${DEFAULT_PRESEED} boot=casper debian-installer/driver-update=true quiet splash ---"23 append="${DEFAULT_PRESEED} debian-installer/driver-update=true quiet splash ---"
24 initrd-size=104857624 initrd-size=1048576
25 read-only25 read-only
2626
@@ -28,41 +28,41 @@
28image[macrisc4]=/casper/powerpc64/vmlinux28image[macrisc4]=/casper/powerpc64/vmlinux
29 label=live29 label=live
30 initrd=${CASPER_POWERPC64_INITRD}30 initrd=${CASPER_POWERPC64_INITRD}
31 append="${DEFAULT_PRESEED} boot=casper quiet splash ---"31 append="${DEFAULT_PRESEED} quiet splash ---"
32 initrd-size=104857632 initrd-size=1048576
33 read-only33 read-only
3434
35image[macrisc4]=/casper/powerpc64/vmlinux35image[macrisc4]=/casper/powerpc64/vmlinux
36 label=live-nosplash36 label=live-nosplash
37 initrd=${CASPER_POWERPC64_INITRD}37 initrd=${CASPER_POWERPC64_INITRD}
38 append="${DEFAULT_PRESEED} boot=casper quiet ---"38 append="${DEFAULT_PRESEED} quiet ---"
39 initrd-size=104857639 initrd-size=1048576
40 read-only40 read-only
4141
42image[macrisc4]=/casper/powerpc64/vmlinux42image[macrisc4]=/casper/powerpc64/vmlinux
43 label=driverupdates43 label=driverupdates
44 initrd=${CASPER_POWERPC64_INITRD}44 initrd=${CASPER_POWERPC64_INITRD}
45 append="${DEFAULT_PRESEED} boot=casper debian-installer/driver-update=true quiet splash ---"45 append="${DEFAULT_PRESEED} debian-installer/driver-update=true quiet splash ---"
46 initrd-size=104857646 initrd-size=1048576
47 read-only47 read-only
4848
49image=/casper/powerpc64/vmlinux49image=/casper/powerpc64/vmlinux
50 label=live-powerpc6450 label=live-powerpc64
51 initrd=${CASPER_POWERPC64_INITRD}51 initrd=${CASPER_POWERPC64_INITRD}
52 append="${DEFAULT_PRESEED} boot=casper quiet splash ---"52 append="${DEFAULT_PRESEED} quiet splash ---"
53 initrd-size=104857653 initrd-size=1048576
54 read-only54 read-only
5555
56image=/casper/powerpc64/vmlinux56image=/casper/powerpc64/vmlinux
57 label=live-nosplash-powerpc6457 label=live-nosplash-powerpc64
58 initrd=${CASPER_POWERPC64_INITRD}58 initrd=${CASPER_POWERPC64_INITRD}
59 append="${DEFAULT_PRESEED} boot=casper quiet ---"59 append="${DEFAULT_PRESEED} quiet ---"
60 initrd-size=104857660 initrd-size=1048576
61 read-only61 read-only
6262
63image=/casper/powerpc64/vmlinux63image=/casper/powerpc64/vmlinux
64 label=driverupdates-powerpc6464 label=driverupdates-powerpc64
65 initrd=${CASPER_POWERPC64_INITRD}65 initrd=${CASPER_POWERPC64_INITRD}
66 append="${DEFAULT_PRESEED} boot=casper debian-installer/driver-update=true quiet splash ---"66 append="${DEFAULT_PRESEED} debian-installer/driver-update=true quiet splash ---"
67 initrd-size=104857667 initrd-size=1048576
68 read-only68 read-only
6969
=== modified file 'tools/boot/eoan/boot-amd64'
--- tools/boot/eoan/boot-amd64 2019-04-20 08:07:06 +0000
+++ tools/boot/eoan/boot-amd64 2019-04-24 11:48:21 +0000
@@ -447,7 +447,7 @@
447label live447label live
448 menu label $livelabel448 menu label $livelabel
449 kernel $CASPER_KERNEL449 kernel $CASPER_KERNEL
450 append $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper$liveparams$LAYERFS_PATH_OPT initrd=$CASPER_INITRD $QUIET $SPLASH ---450 append $KERNEL_PARAMS $DEFAULT_PRESEED $liveparams$LAYERFS_PATH_OPT initrd=$CASPER_INITRD $QUIET $SPLASH ---
451EOF451EOF
452for variant in "" " (safe graphics)^ nomodeset"; do452for variant in "" " (safe graphics)^ nomodeset"; do
453 suffix="${variant%^*}"453 suffix="${variant%^*}"
@@ -455,7 +455,7 @@
455 cat >> $CDDIR/boot/grub/grub.cfg <<EOF455 cat >> $CDDIR/boot/grub/grub.cfg <<EOF
456menuentry "${livelabel#^}${suffix}" {456menuentry "${livelabel#^}${suffix}" {
457 set gfxpayload=keep457 set gfxpayload=keep
458 linux $CASPER_KERNEL $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper$liveparams$LAYERFS_PATH_OPT $QUIET $SPLASH$extra_kopt ---458 linux $CASPER_KERNEL $KERNEL_PARAMS $DEFAULT_PRESEED $liveparams$LAYERFS_PATH_OPT $QUIET $SPLASH$extra_kopt ---
459 initrd $CASPER_INITRD459 initrd $CASPER_INITRD
460}460}
461EOF461EOF
@@ -463,7 +463,7 @@
463 cat >> $CDDIR/boot/grub/loopback.cfg <<EOF463 cat >> $CDDIR/boot/grub/loopback.cfg <<EOF
464menuentry "${livelabel#^}" {464menuentry "${livelabel#^}" {
465 set gfxpayload=keep465 set gfxpayload=keep
466 linux $CASPER_KERNEL $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper$liveparams$LAYERFS_PATH_OPT iso-scan/filename=\${iso_path} $QUIET $SPLASH ---466 linux $CASPER_KERNEL $KERNEL_PARAMS $DEFAULT_PRESEED $liveparams$LAYERFS_PATH_OPT iso-scan/filename=\${iso_path} $QUIET $SPLASH ---
467 initrd $CASPER_INITRD467 initrd $CASPER_INITRD
468}468}
469EOF469EOF
@@ -472,7 +472,7 @@
472label live-install472label live-install
473 menu label ^Install $HUMANPROJECT473 menu label ^Install $HUMANPROJECT
474 kernel $CASPER_KERNEL474 kernel $CASPER_KERNEL
475 append $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper$LAYERFS_PATH_OPT only-ubiquity initrd=$CASPER_INITRD $QUIET $SPLASH ---475 append $KERNEL_PARAMS $DEFAULT_PRESEED $LAYERFS_PATH_OPT only-ubiquity initrd=$CASPER_INITRD $QUIET $SPLASH ---
476EOF476EOF
477 for variant in "" " (safe graphics)^ nomodeset"; do477 for variant in "" " (safe graphics)^ nomodeset"; do
478 suffix="${variant%^*}"478 suffix="${variant%^*}"
@@ -480,14 +480,14 @@
480 cat >> $CDDIR/boot/grub/grub.cfg <<EOF480 cat >> $CDDIR/boot/grub/grub.cfg <<EOF
481menuentry "Install $HUMANPROJECT${suffix}" {481menuentry "Install $HUMANPROJECT${suffix}" {
482 set gfxpayload=keep482 set gfxpayload=keep
483 linux $CASPER_KERNEL $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper$LAYERFS_PATH_OPT only-ubiquity $QUIET $SPLASH$extra_kopt ---483 linux $CASPER_KERNEL $KERNEL_PARAMS $DEFAULT_PRESEED $LAYERFS_PATH_OPT only-ubiquity $QUIET $SPLASH$extra_kopt ---
484 initrd $CASPER_INITRD484 initrd $CASPER_INITRD
485}485}
486EOF486EOF
487 done487 done
488 cat >> $CDDIR/boot/grub/loopback.cfg <<EOF488 cat >> $CDDIR/boot/grub/loopback.cfg <<EOF
489menuentry "Install $HUMANPROJECT" {489menuentry "Install $HUMANPROJECT" {
490 linux $CASPER_KERNEL $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper$LAYERFS_PATH_OPT only-ubiquity iso-scan/filename=\${iso_path} $QUIET $SPLASH ---490 linux $CASPER_KERNEL $KERNEL_PARAMS $DEFAULT_PRESEED $LAYERFS_PATH_OPT only-ubiquity iso-scan/filename=\${iso_path} $QUIET $SPLASH ---
491 initrd $CASPER_INITRD491 initrd $CASPER_INITRD
492}492}
493EOF493EOF
@@ -567,7 +567,7 @@
567 cat >> $CDDIR/boot/grub/${!kp}grub.cfg <<EOF567 cat >> $CDDIR/boot/grub/${!kp}grub.cfg <<EOF
568menuentry "OEM install (for manufacturers)" {568menuentry "OEM install (for manufacturers)" {
569 set gfxpayload=keep569 set gfxpayload=keep
570 linux $CASPER_KERNEL $KERNEL_PARAMS ${DEFAULT_PRESEED/$PREFIX_PRESEED/$PREFIX_PRESEED${!kp}} boot=casper$LAYERFS_PATH_OPT only-ubiquity quiet splash oem-config/enable=true ---570 linux $CASPER_KERNEL $KERNEL_PARAMS ${DEFAULT_PRESEED/$PREFIX_PRESEED/$PREFIX_PRESEED${!kp}} $LAYERFS_PATH_OPT only-ubiquity quiet splash oem-config/enable=true ---
571 initrd $CASPER_INITRD571 initrd $CASPER_INITRD
572}572}
573EOF573EOF
@@ -651,18 +651,18 @@
651label check651label check
652 menu label ^Check disc for defects652 menu label ^Check disc for defects
653 kernel $CASPER_KERNEL653 kernel $CASPER_KERNEL
654 append $KERNEL_PARAMS boot=casper$LAYERFS_PATH_OPT integrity-check initrd=$CASPER_INITRD quiet splash ---654 append $KERNEL_PARAMS $LAYERFS_PATH_OPT integrity-check initrd=$CASPER_INITRD quiet splash ---
655EOF655EOF
656 cat >> $CDDIR/boot/grub/grub.cfg <<EOF656 cat >> $CDDIR/boot/grub/grub.cfg <<EOF
657menuentry "Check disc for defects" {657menuentry "Check disc for defects" {
658 set gfxpayload=keep658 set gfxpayload=keep
659 linux $CASPER_KERNEL $KERNEL_PARAMS boot=casper$LAYERFS_PATH_OPT integrity-check quiet splash ---659 linux $CASPER_KERNEL $KERNEL_PARAMS $LAYERFS_PATH_OPT integrity-check quiet splash ---
660 initrd $CASPER_INITRD660 initrd $CASPER_INITRD
661}661}
662EOF662EOF
663 cat >> $CDDIR/boot/grub/loopback.cfg <<EOF663 cat >> $CDDIR/boot/grub/loopback.cfg <<EOF
664menuentry "Check disc for defects" {664menuentry "Check disc for defects" {
665 linux $CASPER_KERNEL $KERNEL_PARAMS boot=casper$LAYERFS_PATH_OPT integrity-check iso-scan/filename=\${iso_path} quiet splash ---665 linux $CASPER_KERNEL $KERNEL_PARAMS $LAYERFS_PATH_OPT integrity-check iso-scan/filename=\${iso_path} quiet splash ---
666 initrd $CASPER_INITRD666 initrd $CASPER_INITRD
667}667}
668EOF668EOF
669669
=== modified file 'tools/boot/eoan/boot-amd64+mac'
--- tools/boot/eoan/boot-amd64+mac 2019-04-20 08:07:06 +0000
+++ tools/boot/eoan/boot-amd64+mac 2019-04-24 11:48:21 +0000
@@ -365,12 +365,12 @@
365label live365label live
366 menu label $livelabel366 menu label $livelabel
367 kernel /casper/vmlinuz367 kernel /casper/vmlinuz
368 append $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper$liveparams initrd=$CASPER_INITRD quiet splash ---368 append $KERNEL_PARAMS $DEFAULT_PRESEED $liveparams initrd=$CASPER_INITRD quiet splash ---
369EOF369EOF
370 cat >> $CDDIR/boot/grub/loopback.cfg <<EOF370 cat >> $CDDIR/boot/grub/loopback.cfg <<EOF
371menuentry "${livelabel#^}" {371menuentry "${livelabel#^}" {
372 set gfxpayload=keep372 set gfxpayload=keep
373 linux /casper/vmlinuz $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper$liveparams iso-scan/filename=\${iso_path} quiet splash ---373 linux /casper/vmlinuz $KERNEL_PARAMS $DEFAULT_PRESEED $liveparams iso-scan/filename=\${iso_path} quiet splash ---
374 initrd $CASPER_INITRD374 initrd $CASPER_INITRD
375}375}
376EOF376EOF
@@ -379,11 +379,11 @@
379label live-install379label live-install
380 menu label ^Install $HUMANPROJECT380 menu label ^Install $HUMANPROJECT
381 kernel /casper/vmlinuz381 kernel /casper/vmlinuz
382 append $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper only-ubiquity initrd=$CASPER_INITRD quiet splash ---382 append $KERNEL_PARAMS $DEFAULT_PRESEED only-ubiquity initrd=$CASPER_INITRD quiet splash ---
383EOF383EOF
384 cat >> $CDDIR/boot/grub/loopback.cfg <<EOF384 cat >> $CDDIR/boot/grub/loopback.cfg <<EOF
385menuentry "Install $HUMANPROJECT" {385menuentry "Install $HUMANPROJECT" {
386 linux /casper/vmlinuz $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper only-ubiquity iso-scan/filename=\${iso_path} quiet splash ---386 linux /casper/vmlinuz $KERNEL_PARAMS $DEFAULT_PRESEED only-ubiquity iso-scan/filename=\${iso_path} quiet splash ---
387 initrd $CASPER_INITRD387 initrd $CASPER_INITRD
388}388}
389EOF389EOF
@@ -489,11 +489,11 @@
489label check489label check
490 menu label ^Check disc for defects490 menu label ^Check disc for defects
491 kernel /casper/vmlinuz491 kernel /casper/vmlinuz
492 append $KERNEL_PARAMS boot=casper integrity-check initrd=$CASPER_INITRD quiet splash ---492 append $KERNEL_PARAMS integrity-check initrd=$CASPER_INITRD quiet splash ---
493EOF493EOF
494 cat >> $CDDIR/boot/grub/loopback.cfg <<EOF494 cat >> $CDDIR/boot/grub/loopback.cfg <<EOF
495menuentry "Check disc for defects" {495menuentry "Check disc for defects" {
496 linux /casper/vmlinuz $KERNEL_PARAMS boot=casper integrity-check iso-scan/filename=\${iso_path} quiet splash ---496 linux /casper/vmlinuz $KERNEL_PARAMS integrity-check iso-scan/filename=\${iso_path} quiet splash ---
497 initrd $CASPER_INITRD497 initrd $CASPER_INITRD
498}498}
499EOF499EOF
500500
=== modified file 'tools/boot/eoan/boot-arm64'
--- tools/boot/eoan/boot-arm64 2019-04-20 08:07:06 +0000
+++ tools/boot/eoan/boot-arm64 2019-04-24 11:48:21 +0000
@@ -176,14 +176,14 @@
176 cat >> $CDDIR/boot/grub/grub.cfg <<EOF176 cat >> $CDDIR/boot/grub/grub.cfg <<EOF
177menuentry "${livelabel#^}" {177menuentry "${livelabel#^}" {
178 set gfxpayload=keep178 set gfxpayload=keep
179 linux $CASPER_KERNEL $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper$liveparams$LAYERFS_PATH_OPT quiet splash ---179 linux $CASPER_KERNEL $KERNEL_PARAMS $DEFAULT_PRESEED $liveparams$LAYERFS_PATH_OPT quiet splash ---
180 initrd $CASPER_INITRD180 initrd $CASPER_INITRD
181}181}
182EOF182EOF
183 cat >> $CDDIR/boot/grub/loopback.cfg <<EOF183 cat >> $CDDIR/boot/grub/loopback.cfg <<EOF
184menuentry "${livelabel#^}" {184menuentry "${livelabel#^}" {
185 set gfxpayload=keep185 set gfxpayload=keep
186 linux $CASPER_KERNEL $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper$liveparams$LAYERFS_PATH_OPT iso-scan/filename=\${iso_path} quiet splash ---186 linux $CASPER_KERNEL $KERNEL_PARAMS $DEFAULT_PRESEED $liveparams$LAYERFS_PATH_OPT iso-scan/filename=\${iso_path} quiet splash ---
187 initrd $CASPER_INITRD187 initrd $CASPER_INITRD
188}188}
189EOF189EOF
@@ -191,13 +191,13 @@
191 cat >> $CDDIR/boot/grub/grub.cfg <<EOF191 cat >> $CDDIR/boot/grub/grub.cfg <<EOF
192menuentry "Install $HUMANPROJECT" {192menuentry "Install $HUMANPROJECT" {
193 set gfxpayload=keep193 set gfxpayload=keep
194 linux $CASPER_KERNEL $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper$LAYERFS_PATH_OPT only-ubiquity quiet splash ---194 linux $CASPER_KERNEL $KERNEL_PARAMS $DEFAULT_PRESEED $LAYERFS_PATH_OPT only-ubiquity quiet splash ---
195 initrd $CASPER_INITRD195 initrd $CASPER_INITRD
196}196}
197EOF197EOF
198 cat >> $CDDIR/boot/grub/loopback.cfg <<EOF198 cat >> $CDDIR/boot/grub/loopback.cfg <<EOF
199menuentry "Install $HUMANPROJECT" {199menuentry "Install $HUMANPROJECT" {
200 linux $CASPER_KERNEL $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper$LAYERFS_PATH_OPT only-ubiquity iso-scan/filename=\${iso_path} quiet splash ---200 linux $CASPER_KERNEL $KERNEL_PARAMS $DEFAULT_PRESEED $LAYERFS_PATH_OPT only-ubiquity iso-scan/filename=\${iso_path} quiet splash ---
201 initrd $CASPER_INITRD201 initrd $CASPER_INITRD
202}202}
203EOF203EOF
@@ -232,7 +232,7 @@
232 cat >> $CDDIR/boot/grub/grub.cfg <<EOF232 cat >> $CDDIR/boot/grub/grub.cfg <<EOF
233menuentry "OEM install (for manufacturers)" {233menuentry "OEM install (for manufacturers)" {
234 set gfxpayload=keep234 set gfxpayload=keep
235 linux $CASPER_KERNEL $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper$LAYERFS_PATH_OPT only-ubiquity quiet splash oem-config/enable=true ---235 linux $CASPER_KERNEL $KERNEL_PARAMS $DEFAULT_PRESEED $LAYERFS_PATH_OPT only-ubiquity quiet splash oem-config/enable=true ---
236 initrd $CASPER_INITRD236 initrd $CASPER_INITRD
237}237}
238EOF238EOF
@@ -270,13 +270,13 @@
270 cat >> $CDDIR/boot/grub/grub.cfg <<EOF270 cat >> $CDDIR/boot/grub/grub.cfg <<EOF
271menuentry "Check disc for defects" {271menuentry "Check disc for defects" {
272 set gfxpayload=keep272 set gfxpayload=keep
273 linux $CASPER_KERNEL $KERNEL_PARAMS boot=casper$LAYERFS_PATH_OPT integrity-check quiet splash ---273 linux $CASPER_KERNEL $KERNEL_PARAMS $LAYERFS_PATH_OPT integrity-check quiet splash ---
274 initrd $CASPER_INITRD274 initrd $CASPER_INITRD
275}275}
276EOF276EOF
277 cat >> $CDDIR/boot/grub/loopback.cfg <<EOF277 cat >> $CDDIR/boot/grub/loopback.cfg <<EOF
278menuentry "Check disc for defects" {278menuentry "Check disc for defects" {
279 linux $CASPER_KERNEL $KERNEL_PARAMS boot=casper$LAYERFS_PATH_OPT integrity-check iso-scan/filename=\${iso_path} quiet splash ---279 linux $CASPER_KERNEL $KERNEL_PARAMS $LAYERFS_PATH_OPT integrity-check iso-scan/filename=\${iso_path} quiet splash ---
280 initrd $CASPER_INITRD280 initrd $CASPER_INITRD
281}281}
282EOF282EOF
283283
=== modified file 'tools/boot/eoan/boot-armel+dove'
--- tools/boot/eoan/boot-armel+dove 2019-04-20 08:07:06 +0000
+++ tools/boot/eoan/boot-armel+dove 2019-04-24 11:48:21 +0000
@@ -120,7 +120,7 @@
120 uboot_input_initrd="$CDDIR/casper/filesystem.initrd-$FLAVOUR"120 uboot_input_initrd="$CDDIR/casper/filesystem.initrd-$FLAVOUR"
121 uboot_kernel="/casper/uImage"121 uboot_kernel="/casper/uImage"
122 uboot_initrd="/casper/uInitrd"122 uboot_initrd="/casper/uInitrd"
123 uboot_extra_cmdline=" --- boot=casper"123 uboot_extra_cmdline=" --- "
124 fi124 fi
125125
126 if [ "$do_uboot" ]; then126 if [ "$do_uboot" ]; then
127127
=== modified file 'tools/boot/eoan/boot-i386'
--- tools/boot/eoan/boot-i386 2019-04-20 08:07:06 +0000
+++ tools/boot/eoan/boot-i386 2019-04-24 11:48:21 +0000
@@ -404,11 +404,11 @@
404label live404label live
405 menu label $livelabel405 menu label $livelabel
406 kernel /casper/vmlinuz406 kernel /casper/vmlinuz
407 append $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper$liveparams initrd=$CASPER_INITRD quiet splash ---407 append $KERNEL_PARAMS $DEFAULT_PRESEED $liveparams initrd=$CASPER_INITRD quiet splash ---
408EOF408EOF
409 cat >> $CDDIR/boot/grub/loopback.cfg <<EOF409 cat >> $CDDIR/boot/grub/loopback.cfg <<EOF
410menuentry "${livelabel#^}" {410menuentry "${livelabel#^}" {
411 linux /casper/vmlinuz $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper$liveparams iso-scan/filename=\${iso_path} quiet splash ---411 linux /casper/vmlinuz $KERNEL_PARAMS $DEFAULT_PRESEED $liveparams iso-scan/filename=\${iso_path} quiet splash ---
412 initrd $CASPER_INITRD412 initrd $CASPER_INITRD
413}413}
414EOF414EOF
@@ -417,11 +417,11 @@
417label live-install417label live-install
418 menu label ^Install $HUMANPROJECT418 menu label ^Install $HUMANPROJECT
419 kernel /casper/vmlinuz419 kernel /casper/vmlinuz
420 append $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper only-ubiquity initrd=$CASPER_INITRD quiet splash ---420 append $KERNEL_PARAMS $DEFAULT_PRESEED only-ubiquity initrd=$CASPER_INITRD quiet splash ---
421EOF421EOF
422 cat >> $CDDIR/boot/grub/loopback.cfg <<EOF422 cat >> $CDDIR/boot/grub/loopback.cfg <<EOF
423menuentry "Install $HUMANPROJECT" {423menuentry "Install $HUMANPROJECT" {
424 linux /casper/vmlinuz $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper only-ubiquity iso-scan/filename=\${iso_path} quiet splash ---424 linux /casper/vmlinuz $KERNEL_PARAMS $DEFAULT_PRESEED only-ubiquity iso-scan/filename=\${iso_path} quiet splash ---
425 initrd $CASPER_INITRD425 initrd $CASPER_INITRD
426}426}
427EOF427EOF
@@ -533,11 +533,11 @@
533label check533label check
534 menu label ^Check disc for defects534 menu label ^Check disc for defects
535 kernel /casper/vmlinuz535 kernel /casper/vmlinuz
536 append $KERNEL_PARAMS boot=casper integrity-check initrd=$CASPER_INITRD quiet splash ---536 append $KERNEL_PARAMS integrity-check initrd=$CASPER_INITRD quiet splash ---
537EOF537EOF
538 cat >> $CDDIR/boot/grub/loopback.cfg <<EOF538 cat >> $CDDIR/boot/grub/loopback.cfg <<EOF
539menuentry "Check disc for defects" {539menuentry "Check disc for defects" {
540 linux /casper/vmlinuz $KERNEL_PARAMS boot=casper integrity-check iso-scan/filename=\${iso_path} quiet splash ---540 linux /casper/vmlinuz $KERNEL_PARAMS integrity-check iso-scan/filename=\${iso_path} quiet splash ---
541 initrd $CASPER_INITRD541 initrd $CASPER_INITRD
542}542}
543EOF543EOF
544544
=== modified file 'tools/boot/eoan/boot-ppc64el'
--- tools/boot/eoan/boot-ppc64el 2019-04-20 08:07:06 +0000
+++ tools/boot/eoan/boot-ppc64el 2019-04-24 11:48:21 +0000
@@ -128,7 +128,7 @@
128 cat >> $CDDIR/boot/grub/${!kp}grub.cfg <<EOF128 cat >> $CDDIR/boot/grub/${!kp}grub.cfg <<EOF
129menuentry "Install $HUMANPROJECT${!kp:+ (HWE)}" {129menuentry "Install $HUMANPROJECT${!kp:+ (HWE)}" {
130 set gfxpayload=keep130 set gfxpayload=keep
131 linux /casper/${!kp}vmlinux $KERNEL_PARAMS boot=casper quiet ---131 linux /casper/${!kp}vmlinux $KERNEL_PARAMS quiet ---
132 initrd /casper/${!kp}initrd.gz132 initrd /casper/${!kp}initrd.gz
133}133}
134EOF134EOF
135135
=== modified file 'tools/boot/eoan/boot-s390x'
--- tools/boot/eoan/boot-s390x 2019-04-20 08:07:06 +0000
+++ tools/boot/eoan/boot-s390x 2019-04-24 11:48:21 +0000
@@ -57,7 +57,7 @@
5757
58# For server-live images, use casper's initrd and kernel instead58# For server-live images, use casper's initrd and kernel instead
59if [ "$CDIMAGE_LIVE" = 1 ]; then59if [ "$CDIMAGE_LIVE" = 1 ]; then
60 CMDLINE="boot=casper$LAYERFS_PATH_OPT --- quiet"60 CMDLINE="$LAYERFS_PATH_OPT --- quiet"
61 mv $CDDIR/casper/filesystem.initrd-generic $imagedir/initrd.ubuntu61 mv $CDDIR/casper/filesystem.initrd-generic $imagedir/initrd.ubuntu
62 mv $CDDIR/casper/filesystem.kernel-generic $imagedir/kernel.ubuntu62 mv $CDDIR/casper/filesystem.kernel-generic $imagedir/kernel.ubuntu
63 echo "$CMDLINE" > $imagedir/parmfile.ubuntu63 echo "$CMDLINE" > $imagedir/parmfile.ubuntu
6464
=== modified file 'tools/boot/eoan/post-boot-armel+omap'
--- tools/boot/eoan/post-boot-armel+omap 2019-04-20 08:07:06 +0000
+++ tools/boot/eoan/post-boot-armel+omap 2019-04-24 11:48:21 +0000
@@ -139,7 +139,7 @@
139 uboot_desc="Ubuntu LiveCD"139 uboot_desc="Ubuntu LiveCD"
140 uboot_input_kernel="$CDDIR/casper/filesystem.kernel-$SUBARCH"140 uboot_input_kernel="$CDDIR/casper/filesystem.kernel-$SUBARCH"
141 uboot_input_initrd="$CDDIR/casper/filesystem.initrd-$SUBARCH"141 uboot_input_initrd="$CDDIR/casper/filesystem.initrd-$SUBARCH"
142 uboot_extra_cmdline=" fixrtc quiet splash -- boot=casper only-ubiquity"142 uboot_extra_cmdline=" fixrtc quiet splash -- only-ubiquity"
143fi143fi
144144
145if [ "$CDIMAGE_PREINSTALLED" = 1 ]; then145if [ "$CDIMAGE_PREINSTALLED" = 1 ]; then

Subscribers

People subscribed via source and target branches