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
1=== modified file 'data/eoan/yaboot/yaboot.conf.check-live'
2--- data/eoan/yaboot/yaboot.conf.check-live 2019-04-20 08:07:06 +0000
3+++ data/eoan/yaboot/yaboot.conf.check-live 2019-04-24 11:48:21 +0000
4@@ -4,7 +4,7 @@
5 label=check
6 alias=check-powerpc
7 initrd=${CASPER_POWERPC_INITRD}
8- append="boot=casper integrity-check quiet splash ---"
9+ append="integrity-check quiet splash ---"
10 initrd-size=1048576
11 read-only
12
13@@ -12,13 +12,13 @@
14 image[macrisc4]=/casper/powerpc64/vmlinux
15 label=check
16 initrd=${CASPER_POWERPC64_INITRD}
17- append="boot=casper integrity-check quiet splash ---"
18+ append="integrity-check quiet splash ---"
19 initrd-size=1048576
20 read-only
21
22 image=/casper/powerpc64/vmlinux
23 label=check-powerpc64
24 initrd=${CASPER_POWERPC64_INITRD}
25- append="boot=casper integrity-check quiet splash ---"
26+ append="integrity-check quiet splash ---"
27 initrd-size=1048576
28 read-only
29
30=== modified file 'data/eoan/yaboot/yaboot.conf.live'
31--- data/eoan/yaboot/yaboot.conf.live 2019-04-20 08:07:06 +0000
32+++ data/eoan/yaboot/yaboot.conf.live 2019-04-24 11:48:21 +0000
33@@ -4,7 +4,7 @@
34 label=live
35 alias=live-powerpc
36 initrd=${CASPER_POWERPC_INITRD}
37- append="${DEFAULT_PRESEED} boot=casper quiet splash ---"
38+ append="${DEFAULT_PRESEED} quiet splash ---"
39 initrd-size=1048576
40 read-only
41
42@@ -12,7 +12,7 @@
43 label=live-nosplash
44 alias=live-nosplash-powerpc
45 initrd=${CASPER_POWERPC_INITRD}
46- append="${DEFAULT_PRESEED} boot=casper quiet ---"
47+ append="${DEFAULT_PRESEED} quiet ---"
48 initrd-size=1048576
49 read-only
50
51@@ -20,7 +20,7 @@
52 label=driverupdates
53 alias=driverupdates-powerpc
54 initrd=${CASPER_POWERPC_INITRD}
55- append="${DEFAULT_PRESEED} boot=casper debian-installer/driver-update=true quiet splash ---"
56+ append="${DEFAULT_PRESEED} debian-installer/driver-update=true quiet splash ---"
57 initrd-size=1048576
58 read-only
59
60@@ -28,41 +28,41 @@
61 image[macrisc4]=/casper/powerpc64/vmlinux
62 label=live
63 initrd=${CASPER_POWERPC64_INITRD}
64- append="${DEFAULT_PRESEED} boot=casper quiet splash ---"
65+ append="${DEFAULT_PRESEED} quiet splash ---"
66 initrd-size=1048576
67 read-only
68
69 image[macrisc4]=/casper/powerpc64/vmlinux
70 label=live-nosplash
71 initrd=${CASPER_POWERPC64_INITRD}
72- append="${DEFAULT_PRESEED} boot=casper quiet ---"
73+ append="${DEFAULT_PRESEED} quiet ---"
74 initrd-size=1048576
75 read-only
76
77 image[macrisc4]=/casper/powerpc64/vmlinux
78 label=driverupdates
79 initrd=${CASPER_POWERPC64_INITRD}
80- append="${DEFAULT_PRESEED} boot=casper debian-installer/driver-update=true quiet splash ---"
81+ append="${DEFAULT_PRESEED} debian-installer/driver-update=true quiet splash ---"
82 initrd-size=1048576
83 read-only
84
85 image=/casper/powerpc64/vmlinux
86 label=live-powerpc64
87 initrd=${CASPER_POWERPC64_INITRD}
88- append="${DEFAULT_PRESEED} boot=casper quiet splash ---"
89+ append="${DEFAULT_PRESEED} quiet splash ---"
90 initrd-size=1048576
91 read-only
92
93 image=/casper/powerpc64/vmlinux
94 label=live-nosplash-powerpc64
95 initrd=${CASPER_POWERPC64_INITRD}
96- append="${DEFAULT_PRESEED} boot=casper quiet ---"
97+ append="${DEFAULT_PRESEED} quiet ---"
98 initrd-size=1048576
99 read-only
100
101 image=/casper/powerpc64/vmlinux
102 label=driverupdates-powerpc64
103 initrd=${CASPER_POWERPC64_INITRD}
104- append="${DEFAULT_PRESEED} boot=casper debian-installer/driver-update=true quiet splash ---"
105+ append="${DEFAULT_PRESEED} debian-installer/driver-update=true quiet splash ---"
106 initrd-size=1048576
107 read-only
108
109=== modified file 'tools/boot/eoan/boot-amd64'
110--- tools/boot/eoan/boot-amd64 2019-04-20 08:07:06 +0000
111+++ tools/boot/eoan/boot-amd64 2019-04-24 11:48:21 +0000
112@@ -447,7 +447,7 @@
113 label live
114 menu label $livelabel
115 kernel $CASPER_KERNEL
116- append $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper$liveparams$LAYERFS_PATH_OPT initrd=$CASPER_INITRD $QUIET $SPLASH ---
117+ append $KERNEL_PARAMS $DEFAULT_PRESEED $liveparams$LAYERFS_PATH_OPT initrd=$CASPER_INITRD $QUIET $SPLASH ---
118 EOF
119 for variant in "" " (safe graphics)^ nomodeset"; do
120 suffix="${variant%^*}"
121@@ -455,7 +455,7 @@
122 cat >> $CDDIR/boot/grub/grub.cfg <<EOF
123 menuentry "${livelabel#^}${suffix}" {
124 set gfxpayload=keep
125- linux $CASPER_KERNEL $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper$liveparams$LAYERFS_PATH_OPT $QUIET $SPLASH$extra_kopt ---
126+ linux $CASPER_KERNEL $KERNEL_PARAMS $DEFAULT_PRESEED $liveparams$LAYERFS_PATH_OPT $QUIET $SPLASH$extra_kopt ---
127 initrd $CASPER_INITRD
128 }
129 EOF
130@@ -463,7 +463,7 @@
131 cat >> $CDDIR/boot/grub/loopback.cfg <<EOF
132 menuentry "${livelabel#^}" {
133 set gfxpayload=keep
134- linux $CASPER_KERNEL $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper$liveparams$LAYERFS_PATH_OPT iso-scan/filename=\${iso_path} $QUIET $SPLASH ---
135+ linux $CASPER_KERNEL $KERNEL_PARAMS $DEFAULT_PRESEED $liveparams$LAYERFS_PATH_OPT iso-scan/filename=\${iso_path} $QUIET $SPLASH ---
136 initrd $CASPER_INITRD
137 }
138 EOF
139@@ -472,7 +472,7 @@
140 label live-install
141 menu label ^Install $HUMANPROJECT
142 kernel $CASPER_KERNEL
143- append $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper$LAYERFS_PATH_OPT only-ubiquity initrd=$CASPER_INITRD $QUIET $SPLASH ---
144+ append $KERNEL_PARAMS $DEFAULT_PRESEED $LAYERFS_PATH_OPT only-ubiquity initrd=$CASPER_INITRD $QUIET $SPLASH ---
145 EOF
146 for variant in "" " (safe graphics)^ nomodeset"; do
147 suffix="${variant%^*}"
148@@ -480,14 +480,14 @@
149 cat >> $CDDIR/boot/grub/grub.cfg <<EOF
150 menuentry "Install $HUMANPROJECT${suffix}" {
151 set gfxpayload=keep
152- linux $CASPER_KERNEL $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper$LAYERFS_PATH_OPT only-ubiquity $QUIET $SPLASH$extra_kopt ---
153+ linux $CASPER_KERNEL $KERNEL_PARAMS $DEFAULT_PRESEED $LAYERFS_PATH_OPT only-ubiquity $QUIET $SPLASH$extra_kopt ---
154 initrd $CASPER_INITRD
155 }
156 EOF
157 done
158 cat >> $CDDIR/boot/grub/loopback.cfg <<EOF
159 menuentry "Install $HUMANPROJECT" {
160- linux $CASPER_KERNEL $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper$LAYERFS_PATH_OPT only-ubiquity iso-scan/filename=\${iso_path} $QUIET $SPLASH ---
161+ linux $CASPER_KERNEL $KERNEL_PARAMS $DEFAULT_PRESEED $LAYERFS_PATH_OPT only-ubiquity iso-scan/filename=\${iso_path} $QUIET $SPLASH ---
162 initrd $CASPER_INITRD
163 }
164 EOF
165@@ -567,7 +567,7 @@
166 cat >> $CDDIR/boot/grub/${!kp}grub.cfg <<EOF
167 menuentry "OEM install (for manufacturers)" {
168 set gfxpayload=keep
169- 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 ---
170+ linux $CASPER_KERNEL $KERNEL_PARAMS ${DEFAULT_PRESEED/$PREFIX_PRESEED/$PREFIX_PRESEED${!kp}} $LAYERFS_PATH_OPT only-ubiquity quiet splash oem-config/enable=true ---
171 initrd $CASPER_INITRD
172 }
173 EOF
174@@ -651,18 +651,18 @@
175 label check
176 menu label ^Check disc for defects
177 kernel $CASPER_KERNEL
178- append $KERNEL_PARAMS boot=casper$LAYERFS_PATH_OPT integrity-check initrd=$CASPER_INITRD quiet splash ---
179+ append $KERNEL_PARAMS $LAYERFS_PATH_OPT integrity-check initrd=$CASPER_INITRD quiet splash ---
180 EOF
181 cat >> $CDDIR/boot/grub/grub.cfg <<EOF
182 menuentry "Check disc for defects" {
183 set gfxpayload=keep
184- linux $CASPER_KERNEL $KERNEL_PARAMS boot=casper$LAYERFS_PATH_OPT integrity-check quiet splash ---
185+ linux $CASPER_KERNEL $KERNEL_PARAMS $LAYERFS_PATH_OPT integrity-check quiet splash ---
186 initrd $CASPER_INITRD
187 }
188 EOF
189 cat >> $CDDIR/boot/grub/loopback.cfg <<EOF
190 menuentry "Check disc for defects" {
191- linux $CASPER_KERNEL $KERNEL_PARAMS boot=casper$LAYERFS_PATH_OPT integrity-check iso-scan/filename=\${iso_path} quiet splash ---
192+ linux $CASPER_KERNEL $KERNEL_PARAMS $LAYERFS_PATH_OPT integrity-check iso-scan/filename=\${iso_path} quiet splash ---
193 initrd $CASPER_INITRD
194 }
195 EOF
196
197=== modified file 'tools/boot/eoan/boot-amd64+mac'
198--- tools/boot/eoan/boot-amd64+mac 2019-04-20 08:07:06 +0000
199+++ tools/boot/eoan/boot-amd64+mac 2019-04-24 11:48:21 +0000
200@@ -365,12 +365,12 @@
201 label live
202 menu label $livelabel
203 kernel /casper/vmlinuz
204- append $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper$liveparams initrd=$CASPER_INITRD quiet splash ---
205+ append $KERNEL_PARAMS $DEFAULT_PRESEED $liveparams initrd=$CASPER_INITRD quiet splash ---
206 EOF
207 cat >> $CDDIR/boot/grub/loopback.cfg <<EOF
208 menuentry "${livelabel#^}" {
209 set gfxpayload=keep
210- linux /casper/vmlinuz $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper$liveparams iso-scan/filename=\${iso_path} quiet splash ---
211+ linux /casper/vmlinuz $KERNEL_PARAMS $DEFAULT_PRESEED $liveparams iso-scan/filename=\${iso_path} quiet splash ---
212 initrd $CASPER_INITRD
213 }
214 EOF
215@@ -379,11 +379,11 @@
216 label live-install
217 menu label ^Install $HUMANPROJECT
218 kernel /casper/vmlinuz
219- append $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper only-ubiquity initrd=$CASPER_INITRD quiet splash ---
220+ append $KERNEL_PARAMS $DEFAULT_PRESEED only-ubiquity initrd=$CASPER_INITRD quiet splash ---
221 EOF
222 cat >> $CDDIR/boot/grub/loopback.cfg <<EOF
223 menuentry "Install $HUMANPROJECT" {
224- linux /casper/vmlinuz $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper only-ubiquity iso-scan/filename=\${iso_path} quiet splash ---
225+ linux /casper/vmlinuz $KERNEL_PARAMS $DEFAULT_PRESEED only-ubiquity iso-scan/filename=\${iso_path} quiet splash ---
226 initrd $CASPER_INITRD
227 }
228 EOF
229@@ -489,11 +489,11 @@
230 label check
231 menu label ^Check disc for defects
232 kernel /casper/vmlinuz
233- append $KERNEL_PARAMS boot=casper integrity-check initrd=$CASPER_INITRD quiet splash ---
234+ append $KERNEL_PARAMS integrity-check initrd=$CASPER_INITRD quiet splash ---
235 EOF
236 cat >> $CDDIR/boot/grub/loopback.cfg <<EOF
237 menuentry "Check disc for defects" {
238- linux /casper/vmlinuz $KERNEL_PARAMS boot=casper integrity-check iso-scan/filename=\${iso_path} quiet splash ---
239+ linux /casper/vmlinuz $KERNEL_PARAMS integrity-check iso-scan/filename=\${iso_path} quiet splash ---
240 initrd $CASPER_INITRD
241 }
242 EOF
243
244=== modified file 'tools/boot/eoan/boot-arm64'
245--- tools/boot/eoan/boot-arm64 2019-04-20 08:07:06 +0000
246+++ tools/boot/eoan/boot-arm64 2019-04-24 11:48:21 +0000
247@@ -176,14 +176,14 @@
248 cat >> $CDDIR/boot/grub/grub.cfg <<EOF
249 menuentry "${livelabel#^}" {
250 set gfxpayload=keep
251- linux $CASPER_KERNEL $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper$liveparams$LAYERFS_PATH_OPT quiet splash ---
252+ linux $CASPER_KERNEL $KERNEL_PARAMS $DEFAULT_PRESEED $liveparams$LAYERFS_PATH_OPT quiet splash ---
253 initrd $CASPER_INITRD
254 }
255 EOF
256 cat >> $CDDIR/boot/grub/loopback.cfg <<EOF
257 menuentry "${livelabel#^}" {
258 set gfxpayload=keep
259- linux $CASPER_KERNEL $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper$liveparams$LAYERFS_PATH_OPT iso-scan/filename=\${iso_path} quiet splash ---
260+ linux $CASPER_KERNEL $KERNEL_PARAMS $DEFAULT_PRESEED $liveparams$LAYERFS_PATH_OPT iso-scan/filename=\${iso_path} quiet splash ---
261 initrd $CASPER_INITRD
262 }
263 EOF
264@@ -191,13 +191,13 @@
265 cat >> $CDDIR/boot/grub/grub.cfg <<EOF
266 menuentry "Install $HUMANPROJECT" {
267 set gfxpayload=keep
268- linux $CASPER_KERNEL $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper$LAYERFS_PATH_OPT only-ubiquity quiet splash ---
269+ linux $CASPER_KERNEL $KERNEL_PARAMS $DEFAULT_PRESEED $LAYERFS_PATH_OPT only-ubiquity quiet splash ---
270 initrd $CASPER_INITRD
271 }
272 EOF
273 cat >> $CDDIR/boot/grub/loopback.cfg <<EOF
274 menuentry "Install $HUMANPROJECT" {
275- linux $CASPER_KERNEL $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper$LAYERFS_PATH_OPT only-ubiquity iso-scan/filename=\${iso_path} quiet splash ---
276+ linux $CASPER_KERNEL $KERNEL_PARAMS $DEFAULT_PRESEED $LAYERFS_PATH_OPT only-ubiquity iso-scan/filename=\${iso_path} quiet splash ---
277 initrd $CASPER_INITRD
278 }
279 EOF
280@@ -232,7 +232,7 @@
281 cat >> $CDDIR/boot/grub/grub.cfg <<EOF
282 menuentry "OEM install (for manufacturers)" {
283 set gfxpayload=keep
284- linux $CASPER_KERNEL $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper$LAYERFS_PATH_OPT only-ubiquity quiet splash oem-config/enable=true ---
285+ linux $CASPER_KERNEL $KERNEL_PARAMS $DEFAULT_PRESEED $LAYERFS_PATH_OPT only-ubiquity quiet splash oem-config/enable=true ---
286 initrd $CASPER_INITRD
287 }
288 EOF
289@@ -270,13 +270,13 @@
290 cat >> $CDDIR/boot/grub/grub.cfg <<EOF
291 menuentry "Check disc for defects" {
292 set gfxpayload=keep
293- linux $CASPER_KERNEL $KERNEL_PARAMS boot=casper$LAYERFS_PATH_OPT integrity-check quiet splash ---
294+ linux $CASPER_KERNEL $KERNEL_PARAMS $LAYERFS_PATH_OPT integrity-check quiet splash ---
295 initrd $CASPER_INITRD
296 }
297 EOF
298 cat >> $CDDIR/boot/grub/loopback.cfg <<EOF
299 menuentry "Check disc for defects" {
300- linux $CASPER_KERNEL $KERNEL_PARAMS boot=casper$LAYERFS_PATH_OPT integrity-check iso-scan/filename=\${iso_path} quiet splash ---
301+ linux $CASPER_KERNEL $KERNEL_PARAMS $LAYERFS_PATH_OPT integrity-check iso-scan/filename=\${iso_path} quiet splash ---
302 initrd $CASPER_INITRD
303 }
304 EOF
305
306=== modified file 'tools/boot/eoan/boot-armel+dove'
307--- tools/boot/eoan/boot-armel+dove 2019-04-20 08:07:06 +0000
308+++ tools/boot/eoan/boot-armel+dove 2019-04-24 11:48:21 +0000
309@@ -120,7 +120,7 @@
310 uboot_input_initrd="$CDDIR/casper/filesystem.initrd-$FLAVOUR"
311 uboot_kernel="/casper/uImage"
312 uboot_initrd="/casper/uInitrd"
313- uboot_extra_cmdline=" --- boot=casper"
314+ uboot_extra_cmdline=" --- "
315 fi
316
317 if [ "$do_uboot" ]; then
318
319=== modified file 'tools/boot/eoan/boot-i386'
320--- tools/boot/eoan/boot-i386 2019-04-20 08:07:06 +0000
321+++ tools/boot/eoan/boot-i386 2019-04-24 11:48:21 +0000
322@@ -404,11 +404,11 @@
323 label live
324 menu label $livelabel
325 kernel /casper/vmlinuz
326- append $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper$liveparams initrd=$CASPER_INITRD quiet splash ---
327+ append $KERNEL_PARAMS $DEFAULT_PRESEED $liveparams initrd=$CASPER_INITRD quiet splash ---
328 EOF
329 cat >> $CDDIR/boot/grub/loopback.cfg <<EOF
330 menuentry "${livelabel#^}" {
331- linux /casper/vmlinuz $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper$liveparams iso-scan/filename=\${iso_path} quiet splash ---
332+ linux /casper/vmlinuz $KERNEL_PARAMS $DEFAULT_PRESEED $liveparams iso-scan/filename=\${iso_path} quiet splash ---
333 initrd $CASPER_INITRD
334 }
335 EOF
336@@ -417,11 +417,11 @@
337 label live-install
338 menu label ^Install $HUMANPROJECT
339 kernel /casper/vmlinuz
340- append $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper only-ubiquity initrd=$CASPER_INITRD quiet splash ---
341+ append $KERNEL_PARAMS $DEFAULT_PRESEED only-ubiquity initrd=$CASPER_INITRD quiet splash ---
342 EOF
343 cat >> $CDDIR/boot/grub/loopback.cfg <<EOF
344 menuentry "Install $HUMANPROJECT" {
345- linux /casper/vmlinuz $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper only-ubiquity iso-scan/filename=\${iso_path} quiet splash ---
346+ linux /casper/vmlinuz $KERNEL_PARAMS $DEFAULT_PRESEED only-ubiquity iso-scan/filename=\${iso_path} quiet splash ---
347 initrd $CASPER_INITRD
348 }
349 EOF
350@@ -533,11 +533,11 @@
351 label check
352 menu label ^Check disc for defects
353 kernel /casper/vmlinuz
354- append $KERNEL_PARAMS boot=casper integrity-check initrd=$CASPER_INITRD quiet splash ---
355+ append $KERNEL_PARAMS integrity-check initrd=$CASPER_INITRD quiet splash ---
356 EOF
357 cat >> $CDDIR/boot/grub/loopback.cfg <<EOF
358 menuentry "Check disc for defects" {
359- linux /casper/vmlinuz $KERNEL_PARAMS boot=casper integrity-check iso-scan/filename=\${iso_path} quiet splash ---
360+ linux /casper/vmlinuz $KERNEL_PARAMS integrity-check iso-scan/filename=\${iso_path} quiet splash ---
361 initrd $CASPER_INITRD
362 }
363 EOF
364
365=== modified file 'tools/boot/eoan/boot-ppc64el'
366--- tools/boot/eoan/boot-ppc64el 2019-04-20 08:07:06 +0000
367+++ tools/boot/eoan/boot-ppc64el 2019-04-24 11:48:21 +0000
368@@ -128,7 +128,7 @@
369 cat >> $CDDIR/boot/grub/${!kp}grub.cfg <<EOF
370 menuentry "Install $HUMANPROJECT${!kp:+ (HWE)}" {
371 set gfxpayload=keep
372- linux /casper/${!kp}vmlinux $KERNEL_PARAMS boot=casper quiet ---
373+ linux /casper/${!kp}vmlinux $KERNEL_PARAMS quiet ---
374 initrd /casper/${!kp}initrd.gz
375 }
376 EOF
377
378=== modified file 'tools/boot/eoan/boot-s390x'
379--- tools/boot/eoan/boot-s390x 2019-04-20 08:07:06 +0000
380+++ tools/boot/eoan/boot-s390x 2019-04-24 11:48:21 +0000
381@@ -57,7 +57,7 @@
382
383 # For server-live images, use casper's initrd and kernel instead
384 if [ "$CDIMAGE_LIVE" = 1 ]; then
385- CMDLINE="boot=casper$LAYERFS_PATH_OPT --- quiet"
386+ CMDLINE="$LAYERFS_PATH_OPT --- quiet"
387 mv $CDDIR/casper/filesystem.initrd-generic $imagedir/initrd.ubuntu
388 mv $CDDIR/casper/filesystem.kernel-generic $imagedir/kernel.ubuntu
389 echo "$CMDLINE" > $imagedir/parmfile.ubuntu
390
391=== modified file 'tools/boot/eoan/post-boot-armel+omap'
392--- tools/boot/eoan/post-boot-armel+omap 2019-04-20 08:07:06 +0000
393+++ tools/boot/eoan/post-boot-armel+omap 2019-04-24 11:48:21 +0000
394@@ -139,7 +139,7 @@
395 uboot_desc="Ubuntu LiveCD"
396 uboot_input_kernel="$CDDIR/casper/filesystem.kernel-$SUBARCH"
397 uboot_input_initrd="$CDDIR/casper/filesystem.initrd-$SUBARCH"
398- uboot_extra_cmdline=" fixrtc quiet splash -- boot=casper only-ubiquity"
399+ uboot_extra_cmdline=" fixrtc quiet splash -- only-ubiquity"
400 fi
401
402 if [ "$CDIMAGE_PREINSTALLED" = 1 ]; then

Subscribers

People subscribed via source and target branches