debian-cd

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

  1. kernel-cli-separator-trusty
  2. Merge into ubun3
Proposed by Mathieu Trudel-Lapierre
Status: Merged
Merged at revision: 1932
Proposed branch: lp:~cyphermox/debian-cd/kernel-cli-separator-trusty
Merge into: lp:~ubuntu-cdimage/debian-cd/ubun3
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 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
=== modified file 'tools/boot/trusty/boot-amd64'
--- tools/boot/trusty/boot-amd64 2015-08-05 22:52:14 +0000
+++ tools/boot/trusty/boot-amd64 2016-02-24 19:25:48 +0000
@@ -384,19 +384,19 @@
384label live384label live
385 menu label $livelabel385 menu label $livelabel
386 kernel $CASPER_KERNEL386 kernel $CASPER_KERNEL
387 append $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper$liveparams initrd=$CASPER_INITRD quiet splash --387 append $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper$liveparams initrd=$CASPER_INITRD quiet splash ---
388EOF388EOF
389 cat >> $CDDIR/boot/grub/grub.cfg <<EOF389 cat >> $CDDIR/boot/grub/grub.cfg <<EOF
390menuentry "${livelabel#^}" {390menuentry "${livelabel#^}" {
391 set gfxpayload=keep391 set gfxpayload=keep
392 linux $CASPER_KERNEL $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper$liveparams quiet splash --392 linux $CASPER_KERNEL $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper$liveparams quiet splash ---
393 initrd $CASPER_INITRD393 initrd $CASPER_INITRD
394}394}
395EOF395EOF
396 cat >> $CDDIR/boot/grub/loopback.cfg <<EOF396 cat >> $CDDIR/boot/grub/loopback.cfg <<EOF
397menuentry "${livelabel#^}" {397menuentry "${livelabel#^}" {
398 set gfxpayload=keep398 set gfxpayload=keep
399 linux $CASPER_KERNEL $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper$liveparams iso-scan/filename=\${iso_path} quiet splash --399 linux $CASPER_KERNEL $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper$liveparams iso-scan/filename=\${iso_path} quiet splash ---
400 initrd $CASPER_INITRD400 initrd $CASPER_INITRD
401}401}
402EOF402EOF
@@ -405,18 +405,18 @@
405label live-install405label live-install
406 menu label ^Install $HUMANPROJECT406 menu label ^Install $HUMANPROJECT
407 kernel $CASPER_KERNEL407 kernel $CASPER_KERNEL
408 append $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper only-ubiquity initrd=$CASPER_INITRD quiet splash --408 append $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper only-ubiquity initrd=$CASPER_INITRD quiet splash ---
409EOF409EOF
410 cat >> $CDDIR/boot/grub/grub.cfg <<EOF410 cat >> $CDDIR/boot/grub/grub.cfg <<EOF
411menuentry "Install $HUMANPROJECT" {411menuentry "Install $HUMANPROJECT" {
412 set gfxpayload=keep412 set gfxpayload=keep
413 linux $CASPER_KERNEL $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper only-ubiquity quiet splash --413 linux $CASPER_KERNEL $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper only-ubiquity quiet splash ---
414 initrd $CASPER_INITRD414 initrd $CASPER_INITRD
415}415}
416EOF416EOF
417 cat >> $CDDIR/boot/grub/loopback.cfg <<EOF417 cat >> $CDDIR/boot/grub/loopback.cfg <<EOF
418menuentry "Install $HUMANPROJECT" {418menuentry "Install $HUMANPROJECT" {
419 linux $CASPER_KERNEL $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper only-ubiquity iso-scan/filename=\${iso_path} quiet splash --419 linux $CASPER_KERNEL $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper only-ubiquity iso-scan/filename=\${iso_path} quiet splash ---
420 initrd $CASPER_INITRD420 initrd $CASPER_INITRD
421}421}
422EOF422EOF
@@ -433,12 +433,12 @@
433label install433label install
434 menu label ^Install $HUMANPROJECT434 menu label ^Install $HUMANPROJECT
435 kernel /install/vmlinuz435 kernel /install/vmlinuz
436 append $KERNEL_PARAMS $DEFAULT_PRESEED vga=788 initrd=/install/initrd.gz quiet --436 append $KERNEL_PARAMS $DEFAULT_PRESEED vga=788 initrd=/install/initrd.gz quiet ---
437EOF437EOF
438 cat >> $CDDIR/boot/grub/grub.cfg <<EOF438 cat >> $CDDIR/boot/grub/grub.cfg <<EOF
439menuentry "Install $HUMANPROJECT" {439menuentry "Install $HUMANPROJECT" {
440 set gfxpayload=keep440 set gfxpayload=keep
441 linux /install/vmlinuz $KERNEL_PARAMS $DEFAULT_PRESEED quiet --441 linux /install/vmlinuz $KERNEL_PARAMS $DEFAULT_PRESEED quiet ---
442 initrd /install/initrd.gz442 initrd /install/initrd.gz
443}443}
444EOF444EOF
@@ -447,12 +447,12 @@
447label install447label install
448 menu label ^Install $HUMANPROJECT in text mode448 menu label ^Install $HUMANPROJECT in text mode
449 kernel /install/vmlinuz449 kernel /install/vmlinuz
450 append $KERNEL_PARAMS $DEFAULT_PRESEED vga=788 initrd=/install/initrd.gz quiet --450 append $KERNEL_PARAMS $DEFAULT_PRESEED vga=788 initrd=/install/initrd.gz quiet ---
451EOF451EOF
452 cat >> $CDDIR/boot/grub/grub.cfg <<EOF452 cat >> $CDDIR/boot/grub/grub.cfg <<EOF
453menuentry "Install $HUMANPROJECT in text mode" {453menuentry "Install $HUMANPROJECT in text mode" {
454 set gfxpayload=keep454 set gfxpayload=keep
455 linux /install/vmlinuz $KERNEL_PARAMS $DEFAULT_PRESEED quiet --455 linux /install/vmlinuz $KERNEL_PARAMS $DEFAULT_PRESEED quiet ---
456 initrd /install/initrd.gz456 initrd /install/initrd.gz
457}457}
458EOF458EOF
@@ -461,7 +461,7 @@
461label expert461label expert
462 menu hide462 menu hide
463 kernel /install/vmlinuz463 kernel /install/vmlinuz
464 append $KERNEL_PARAMS $DEFAULT_PRESEED priority=low vga=788 initrd=/install/initrd.gz --464 append $KERNEL_PARAMS $DEFAULT_PRESEED priority=low vga=788 initrd=/install/initrd.gz ---
465EOF465EOF
466 if [ "$PROJECT" = edubuntu ]; then466 if [ "$PROJECT" = edubuntu ]; then
467 cat >> boot$N/isolinux/gfxboot.cfg <<EOF467 cat >> boot$N/isolinux/gfxboot.cfg <<EOF
@@ -493,7 +493,7 @@
493 cat >> $CDDIR/boot/grub/grub.cfg <<EOF493 cat >> $CDDIR/boot/grub/grub.cfg <<EOF
494menuentry "OEM install (for manufacturers)" {494menuentry "OEM install (for manufacturers)" {
495 set gfxpayload=keep495 set gfxpayload=keep
496 linux $CASPER_KERNEL $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper only-ubiquity quiet splash oem-config/enable=true --496 linux $CASPER_KERNEL $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper only-ubiquity quiet splash oem-config/enable=true ---
497 initrd $CASPER_INITRD497 initrd $CASPER_INITRD
498}498}
499EOF499EOF
@@ -504,7 +504,7 @@
504 cat >> $CDDIR/boot/grub/grub.cfg <<EOF504 cat >> $CDDIR/boot/grub/grub.cfg <<EOF
505menuentry "OEM install (for manufacturers)" {505menuentry "OEM install (for manufacturers)" {
506 set gfxpayload=keep506 set gfxpayload=keep
507 linux /install/vmlinuz $KERNEL_PARAMS $DEFAULT_PRESEED quiet oem-config/enable=true --507 linux /install/vmlinuz $KERNEL_PARAMS $DEFAULT_PRESEED quiet oem-config/enable=true ---
508 initrd /install/initrd.gz508 initrd /install/initrd.gz
509}509}
510EOF510EOF
@@ -531,12 +531,12 @@
531label cloud531label cloud
532 menu label ^Multiple server install with MAAS532 menu label ^Multiple server install with MAAS
533 kernel /install/vmlinuz533 kernel /install/vmlinuz
534 append $KERNEL_PARAMS $FRONTEND_BACKGROUND modules=maas-enlist-udeb vga=788 initrd=/install/initrd.gz quiet --534 append $KERNEL_PARAMS $FRONTEND_BACKGROUND modules=maas-enlist-udeb vga=788 initrd=/install/initrd.gz quiet ---
535EOF535EOF
536 cat >> $CDDIR/boot/grub/grub.cfg <<EOF536 cat >> $CDDIR/boot/grub/grub.cfg <<EOF
537menuentry "Multiple server install with MAAS" {537menuentry "Multiple server install with MAAS" {
538 set gfxpayload=keep538 set gfxpayload=keep
539 linux /install/vmlinuz $KERNEL_PARAMS modules=maas-enlist-udeb vga=788 initrd=/install/initrd.gz quiet --539 linux /install/vmlinuz $KERNEL_PARAMS modules=maas-enlist-udeb vga=788 initrd=/install/initrd.gz quiet ---
540 initrd /install/initrd.gz540 initrd /install/initrd.gz
541}541}
542EOF542EOF
@@ -561,18 +561,18 @@
561label check561label check
562 menu label ^Check disc for defects562 menu label ^Check disc for defects
563 kernel $CASPER_KERNEL563 kernel $CASPER_KERNEL
564 append $KERNEL_PARAMS boot=casper integrity-check initrd=$CASPER_INITRD quiet splash --564 append $KERNEL_PARAMS boot=casper integrity-check initrd=$CASPER_INITRD quiet splash ---
565EOF565EOF
566 cat >> $CDDIR/boot/grub/grub.cfg <<EOF566 cat >> $CDDIR/boot/grub/grub.cfg <<EOF
567menuentry "Check disc for defects" {567menuentry "Check disc for defects" {
568 set gfxpayload=keep568 set gfxpayload=keep
569 linux $CASPER_KERNEL $KERNEL_PARAMS boot=casper integrity-check quiet splash --569 linux $CASPER_KERNEL $KERNEL_PARAMS boot=casper integrity-check quiet splash ---
570 initrd $CASPER_INITRD570 initrd $CASPER_INITRD
571}571}
572EOF572EOF
573 cat >> $CDDIR/boot/grub/loopback.cfg <<EOF573 cat >> $CDDIR/boot/grub/loopback.cfg <<EOF
574menuentry "Check disc for defects" {574menuentry "Check disc for defects" {
575 linux $CASPER_KERNEL $KERNEL_PARAMS boot=casper integrity-check iso-scan/filename=\${iso_path} quiet splash --575 linux $CASPER_KERNEL $KERNEL_PARAMS boot=casper integrity-check iso-scan/filename=\${iso_path} quiet splash ---
576 initrd $CASPER_INITRD576 initrd $CASPER_INITRD
577}577}
578EOF578EOF
@@ -581,12 +581,12 @@
581label check581label check
582 menu label ^Check disc for defects582 menu label ^Check disc for defects
583 kernel /install/vmlinuz583 kernel /install/vmlinuz
584 append $KERNEL_PARAMS $FRONTEND_BACKGROUND MENU=/bin/cdrom-checker-menu vga=788 initrd=/install/initrd.gz quiet --584 append $KERNEL_PARAMS $FRONTEND_BACKGROUND MENU=/bin/cdrom-checker-menu vga=788 initrd=/install/initrd.gz quiet ---
585EOF585EOF
586 cat >> $CDDIR/boot/grub/grub.cfg <<EOF586 cat >> $CDDIR/boot/grub/grub.cfg <<EOF
587menuentry "Check disc for defects" {587menuentry "Check disc for defects" {
588 set gfxpayload=keep588 set gfxpayload=keep
589 linux /install/vmlinuz $KERNEL_PARAMS MENU=/bin/cdrom-checker-menu quiet --589 linux /install/vmlinuz $KERNEL_PARAMS MENU=/bin/cdrom-checker-menu quiet ---
590 initrd /install/initrd.gz590 initrd /install/initrd.gz
591}591}
592EOF592EOF
@@ -596,12 +596,12 @@
596label rescue596label rescue
597 menu label ^Rescue a broken system597 menu label ^Rescue a broken system
598 kernel /install/vmlinuz598 kernel /install/vmlinuz
599 append $KERNEL_PARAMS $FRONTEND_BACKGROUND rescue/enable=true vga=788 initrd=/install/initrd.gz --599 append $KERNEL_PARAMS $FRONTEND_BACKGROUND rescue/enable=true vga=788 initrd=/install/initrd.gz ---
600EOF600EOF
601 cat >> $CDDIR/boot/grub/grub.cfg <<EOF601 cat >> $CDDIR/boot/grub/grub.cfg <<EOF
602menuentry "Rescue a broken system" {602menuentry "Rescue a broken system" {
603 set gfxpayload=keep603 set gfxpayload=keep
604 linux /install/vmlinuz $KERNEL_PARAMS rescue/enable=true --604 linux /install/vmlinuz $KERNEL_PARAMS rescue/enable=true ---
605 initrd /install/initrd.gz605 initrd /install/initrd.gz
606}606}
607EOF607EOF
608608
=== modified file 'tools/boot/trusty/boot-amd64+mac'
--- tools/boot/trusty/boot-amd64+mac 2015-08-05 22:52:14 +0000
+++ tools/boot/trusty/boot-amd64+mac 2016-02-24 19:25:48 +0000
@@ -360,12 +360,12 @@
360label live360label live
361 menu label $livelabel361 menu label $livelabel
362 kernel /casper/vmlinuz362 kernel /casper/vmlinuz
363 append $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper$liveparams initrd=$CASPER_INITRD quiet splash --363 append $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper$liveparams initrd=$CASPER_INITRD quiet splash ---
364EOF364EOF
365 cat >> $CDDIR/boot/grub/loopback.cfg <<EOF365 cat >> $CDDIR/boot/grub/loopback.cfg <<EOF
366menuentry "${livelabel#^}" {366menuentry "${livelabel#^}" {
367 set gfxpayload=keep367 set gfxpayload=keep
368 linux /casper/vmlinuz $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper$liveparams iso-scan/filename=\${iso_path} quiet splash --368 linux /casper/vmlinuz $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper$liveparams iso-scan/filename=\${iso_path} quiet splash ---
369 initrd $CASPER_INITRD369 initrd $CASPER_INITRD
370}370}
371EOF371EOF
@@ -374,11 +374,11 @@
374label live-install374label live-install
375 menu label ^Install $HUMANPROJECT375 menu label ^Install $HUMANPROJECT
376 kernel /casper/vmlinuz376 kernel /casper/vmlinuz
377 append $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper only-ubiquity initrd=$CASPER_INITRD quiet splash --377 append $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper only-ubiquity initrd=$CASPER_INITRD quiet splash ---
378EOF378EOF
379 cat >> $CDDIR/boot/grub/loopback.cfg <<EOF379 cat >> $CDDIR/boot/grub/loopback.cfg <<EOF
380menuentry "Install $HUMANPROJECT" {380menuentry "Install $HUMANPROJECT" {
381 linux /casper/vmlinuz $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper only-ubiquity iso-scan/filename=\${iso_path} quiet splash --381 linux /casper/vmlinuz $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper only-ubiquity iso-scan/filename=\${iso_path} quiet splash ---
382 initrd $CASPER_INITRD382 initrd $CASPER_INITRD
383}383}
384EOF384EOF
@@ -395,21 +395,21 @@
395label install395label install
396 menu label ^Install $HUMANPROJECT396 menu label ^Install $HUMANPROJECT
397 kernel /install/vmlinuz397 kernel /install/vmlinuz
398 append $KERNEL_PARAMS $DEFAULT_PRESEED vga=788 initrd=/install/initrd.gz quiet --398 append $KERNEL_PARAMS $DEFAULT_PRESEED vga=788 initrd=/install/initrd.gz quiet ---
399EOF399EOF
400 else400 else
401 cat >> boot$N/isolinux/txt.cfg <<EOF401 cat >> boot$N/isolinux/txt.cfg <<EOF
402label install402label install
403 menu label ^Install $HUMANPROJECT in text mode403 menu label ^Install $HUMANPROJECT in text mode
404 kernel /install/vmlinuz404 kernel /install/vmlinuz
405 append $KERNEL_PARAMS $DEFAULT_PRESEED vga=788 initrd=/install/initrd.gz quiet --405 append $KERNEL_PARAMS $DEFAULT_PRESEED vga=788 initrd=/install/initrd.gz quiet ---
406EOF406EOF
407 fi407 fi
408 cat >> boot$N/isolinux/adtxt.cfg <<EOF408 cat >> boot$N/isolinux/adtxt.cfg <<EOF
409label expert409label expert
410 menu hide410 menu hide
411 kernel /install/vmlinuz411 kernel /install/vmlinuz
412 append $KERNEL_PARAMS $DEFAULT_PRESEED priority=low vga=788 initrd=/install/initrd.gz --412 append $KERNEL_PARAMS $DEFAULT_PRESEED priority=low vga=788 initrd=/install/initrd.gz ---
413EOF413EOF
414 if [ "$PROJECT" = edubuntu ]; then414 if [ "$PROJECT" = edubuntu ]; then
415 cat >> boot$N/isolinux/gfxboot.cfg <<EOF415 cat >> boot$N/isolinux/gfxboot.cfg <<EOF
@@ -461,7 +461,7 @@
461label cloud461label cloud
462 menu label ^Multiple server install with MAAS462 menu label ^Multiple server install with MAAS
463 kernel /install/vmlinuz463 kernel /install/vmlinuz
464 append $KERNEL_PARAMS $FRONTEND_BACKGROUND modules=maas-enlist-udeb vga=788 initrd=/install/initrd.gz quiet --464 append $KERNEL_PARAMS $FRONTEND_BACKGROUND modules=maas-enlist-udeb vga=788 initrd=/install/initrd.gz quiet ---
465EOF465EOF
466 fi466 fi
467fi467fi
@@ -484,11 +484,11 @@
484label check484label check
485 menu label ^Check disc for defects485 menu label ^Check disc for defects
486 kernel /casper/vmlinuz486 kernel /casper/vmlinuz
487 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 ---
488EOF488EOF
489 cat >> $CDDIR/boot/grub/loopback.cfg <<EOF489 cat >> $CDDIR/boot/grub/loopback.cfg <<EOF
490menuentry "Check disc for defects" {490menuentry "Check disc for defects" {
491 linux /casper/vmlinuz $KERNEL_PARAMS boot=casper integrity-check iso-scan/filename=\${iso_path} quiet splash --491 linux /casper/vmlinuz $KERNEL_PARAMS boot=casper integrity-check iso-scan/filename=\${iso_path} quiet splash ---
492 initrd $CASPER_INITRD492 initrd $CASPER_INITRD
493}493}
494EOF494EOF
@@ -497,7 +497,7 @@
497label check497label check
498 menu label ^Check disc for defects498 menu label ^Check disc for defects
499 kernel /install/vmlinuz499 kernel /install/vmlinuz
500 append $KERNEL_PARAMS $FRONTEND_BACKGROUND MENU=/bin/cdrom-checker-menu vga=788 initrd=/install/initrd.gz quiet --500 append $KERNEL_PARAMS $FRONTEND_BACKGROUND MENU=/bin/cdrom-checker-menu vga=788 initrd=/install/initrd.gz quiet ---
501EOF501EOF
502fi502fi
503if [ "$CDIMAGE_INSTALL_BASE" = 1 ]; then503if [ "$CDIMAGE_INSTALL_BASE" = 1 ]; then
@@ -505,7 +505,7 @@
505label rescue505label rescue
506 menu label ^Rescue a broken system506 menu label ^Rescue a broken system
507 kernel /install/vmlinuz507 kernel /install/vmlinuz
508 append $KERNEL_PARAMS $FRONTEND_BACKGROUND rescue/enable=true vga=788 initrd=/install/initrd.gz --508 append $KERNEL_PARAMS $FRONTEND_BACKGROUND rescue/enable=true vga=788 initrd=/install/initrd.gz ---
509EOF509EOF
510fi510fi
511cat >> boot$N/isolinux/txt.cfg <<EOF511cat >> boot$N/isolinux/txt.cfg <<EOF
512512
=== modified file 'tools/boot/trusty/boot-armel+dove'
--- tools/boot/trusty/boot-armel+dove 2015-08-05 22:52:14 +0000
+++ tools/boot/trusty/boot-armel+dove 2016-02-24 19:25:48 +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=" --- boot=casper"
124 fi124 fi
125125
126 if [ "$do_uboot" ]; then126 if [ "$do_uboot" ]; then
127127
=== modified file 'tools/boot/trusty/boot-i386'
--- tools/boot/trusty/boot-i386 2015-08-05 22:52:14 +0000
+++ tools/boot/trusty/boot-i386 2016-02-24 19:25:48 +0000
@@ -364,11 +364,11 @@
364label live364label live
365 menu label $livelabel365 menu label $livelabel
366 kernel /casper/vmlinuz366 kernel /casper/vmlinuz
367 append $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper$liveparams initrd=$CASPER_INITRD quiet splash --367 append $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper$liveparams initrd=$CASPER_INITRD quiet splash ---
368EOF368EOF
369 cat >> $CDDIR/boot/grub/loopback.cfg <<EOF369 cat >> $CDDIR/boot/grub/loopback.cfg <<EOF
370menuentry "${livelabel#^}" {370menuentry "${livelabel#^}" {
371 linux /casper/vmlinuz $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper$liveparams iso-scan/filename=\${iso_path} quiet splash --371 linux /casper/vmlinuz $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper$liveparams iso-scan/filename=\${iso_path} quiet splash ---
372 initrd $CASPER_INITRD372 initrd $CASPER_INITRD
373}373}
374EOF374EOF
@@ -377,11 +377,11 @@
377label live-install377label live-install
378 menu label ^Install $HUMANPROJECT378 menu label ^Install $HUMANPROJECT
379 kernel /casper/vmlinuz379 kernel /casper/vmlinuz
380 append $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper only-ubiquity initrd=$CASPER_INITRD quiet splash --380 append $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper only-ubiquity initrd=$CASPER_INITRD quiet splash ---
381EOF381EOF
382 cat >> $CDDIR/boot/grub/loopback.cfg <<EOF382 cat >> $CDDIR/boot/grub/loopback.cfg <<EOF
383menuentry "Install $HUMANPROJECT" {383menuentry "Install $HUMANPROJECT" {
384 linux /casper/vmlinuz $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper only-ubiquity iso-scan/filename=\${iso_path} quiet splash --384 linux /casper/vmlinuz $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper only-ubiquity iso-scan/filename=\${iso_path} quiet splash ---
385 initrd $CASPER_INITRD385 initrd $CASPER_INITRD
386}386}
387EOF387EOF
@@ -398,21 +398,21 @@
398label install398label install
399 menu label ^Install $HUMANPROJECT399 menu label ^Install $HUMANPROJECT
400 kernel /install/vmlinuz400 kernel /install/vmlinuz
401 append $KERNEL_PARAMS $DEFAULT_PRESEED vga=788 initrd=/install/initrd.gz quiet --401 append $KERNEL_PARAMS $DEFAULT_PRESEED vga=788 initrd=/install/initrd.gz quiet ---
402EOF402EOF
403 else403 else
404 cat >> boot$N/isolinux/txt.cfg <<EOF404 cat >> boot$N/isolinux/txt.cfg <<EOF
405label install405label install
406 menu label ^Install $HUMANPROJECT in text mode406 menu label ^Install $HUMANPROJECT in text mode
407 kernel /install/vmlinuz407 kernel /install/vmlinuz
408 append $KERNEL_PARAMS $DEFAULT_PRESEED vga=788 initrd=/install/initrd.gz quiet --408 append $KERNEL_PARAMS $DEFAULT_PRESEED vga=788 initrd=/install/initrd.gz quiet ---
409EOF409EOF
410 fi410 fi
411 cat >> boot$N/isolinux/adtxt.cfg <<EOF411 cat >> boot$N/isolinux/adtxt.cfg <<EOF
412label expert412label expert
413 menu hide413 menu hide
414 kernel /install/vmlinuz414 kernel /install/vmlinuz
415 append $KERNEL_PARAMS $DEFAULT_PRESEED priority=low vga=788 initrd=/install/initrd.gz --415 append $KERNEL_PARAMS $DEFAULT_PRESEED priority=low vga=788 initrd=/install/initrd.gz ---
416EOF416EOF
417 if [ "$PROJECT" = edubuntu ]; then417 if [ "$PROJECT" = edubuntu ]; then
418 cat >> boot$N/isolinux/gfxboot.cfg <<EOF418 cat >> boot$N/isolinux/gfxboot.cfg <<EOF
@@ -464,7 +464,7 @@
464label cloud464label cloud
465 menu label ^Multiple server install with MAAS465 menu label ^Multiple server install with MAAS
466 kernel /install/vmlinuz466 kernel /install/vmlinuz
467 append $KERNEL_PARAMS $FRONTEND_BACKGROUND modules=maas-enlist-udeb vga=788 initrd=/install/initrd.gz quiet --467 append $KERNEL_PARAMS $FRONTEND_BACKGROUND modules=maas-enlist-udeb vga=788 initrd=/install/initrd.gz quiet ---
468EOF468EOF
469 fi469 fi
470fi470fi
@@ -487,11 +487,11 @@
487label check487label check
488 menu label ^Check disc for defects488 menu label ^Check disc for defects
489 kernel /casper/vmlinuz489 kernel /casper/vmlinuz
490 append $KERNEL_PARAMS boot=casper integrity-check initrd=$CASPER_INITRD quiet splash --490 append $KERNEL_PARAMS boot=casper integrity-check initrd=$CASPER_INITRD quiet splash ---
491EOF491EOF
492 cat >> $CDDIR/boot/grub/loopback.cfg <<EOF492 cat >> $CDDIR/boot/grub/loopback.cfg <<EOF
493menuentry "Check disc for defects" {493menuentry "Check disc for defects" {
494 linux /casper/vmlinuz $KERNEL_PARAMS boot=casper integrity-check iso-scan/filename=\${iso_path} quiet splash --494 linux /casper/vmlinuz $KERNEL_PARAMS boot=casper integrity-check iso-scan/filename=\${iso_path} quiet splash ---
495 initrd $CASPER_INITRD495 initrd $CASPER_INITRD
496}496}
497EOF497EOF
@@ -500,7 +500,7 @@
500label check500label check
501 menu label ^Check disc for defects501 menu label ^Check disc for defects
502 kernel /install/vmlinuz502 kernel /install/vmlinuz
503 append $KERNEL_PARAMS $FRONTEND_BACKGROUND MENU=/bin/cdrom-checker-menu vga=788 initrd=/install/initrd.gz quiet --503 append $KERNEL_PARAMS $FRONTEND_BACKGROUND MENU=/bin/cdrom-checker-menu vga=788 initrd=/install/initrd.gz quiet ---
504EOF504EOF
505fi505fi
506if [ "$CDIMAGE_INSTALL_BASE" = 1 ]; then506if [ "$CDIMAGE_INSTALL_BASE" = 1 ]; then
@@ -508,7 +508,7 @@
508label rescue508label rescue
509 menu label ^Rescue a broken system509 menu label ^Rescue a broken system
510 kernel /install/vmlinuz510 kernel /install/vmlinuz
511 append $KERNEL_PARAMS $FRONTEND_BACKGROUND rescue/enable=true vga=788 initrd=/install/initrd.gz --511 append $KERNEL_PARAMS $FRONTEND_BACKGROUND rescue/enable=true vga=788 initrd=/install/initrd.gz ---
512EOF512EOF
513fi513fi
514cat >> boot$N/isolinux/txt.cfg <<EOF514cat >> boot$N/isolinux/txt.cfg <<EOF
515515
=== modified file 'tools/boot/trusty/post-boot-armel+omap'
--- tools/boot/trusty/post-boot-armel+omap 2013-10-18 14:52:32 +0000
+++ tools/boot/trusty/post-boot-armel+omap 2016-02-24 19:25:48 +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 --- boot=casper only-ubiquity"
143fi143fi
144144
145if [ "$CDIMAGE_PREINSTALLED" = 1 ]; then145if [ "$CDIMAGE_PREINSTALLED" = 1 ]; then

Subscribers

People subscribed via source and target branches