← Back to branch summary

~eeickmeyer/debian-cd/ubuntu

« back to all changes in this revision

Viewing changes to tools/boot/focal/boot-amd64

merge lp:~xnox/debian-cd/no-try-only-do-in-grub

Show diffs side-by-side

added added

removed removed

Lines of Context:
tools/boot/focal/boot-amd64
459
459
            liveparams=
460
460
            NOTRYONLYDO=true
461
461
            ;;
 
462
        ubuntu)
 
463
            livelabel="^Try $HUMANPROJECT without installing"
 
464
            liveparams=
 
465
            livelabelgrub="^$HUMANPROJECT"
 
466
            liveparamsgrub=' maybe-ubiquity'
 
467
            NOTRYONLYDOINGRUB=true
 
468
            ;;
462
469
        *)
463
470
            livelabel="^Try $HUMANPROJECT without installing"
464
471
            liveparams=
465
472
    esac
466
473
 
 
474
    if [ -z "$livelabelgrub" ]; then
 
475
        livelabelgrub="$livelabel"
 
476
        liveparamsgrub="$liveparams"
 
477
    fi
 
478
    
 
479
    
467
480
    LAYERFS_PATH_OPT=$(add_layerfs_path_opt)
468
481
 
469
482
for variant in "" " (safe graphics)^ nomodeset"; do
476
489
  append $KERNEL_PARAMS $DEFAULT_PRESEED$liveparams$LAYERFS_PATH_OPT initrd=$CASPER_INITRD $QUIET $SPLASH$extra_kopt ---
477
490
EOF
478
491
    cat >> $CDDIR/boot/grub/grub.cfg <<EOF
479
 
menuentry "${livelabel#^}${suffix}" {
 
492
menuentry "${livelabelgrub#^}${suffix}" {
480
493
        set gfxpayload=keep
481
 
        linux   $CASPER_KERNEL\$casper_flavour $KERNEL_PARAMS $DEFAULT_PRESEED$liveparams$LAYERFS_PATH_OPT $QUIET $SPLASH$extra_kopt ---
 
494
        linux   $CASPER_KERNEL\$casper_flavour $KERNEL_PARAMS $DEFAULT_PRESEED$liveparamsgrub$LAYERFS_PATH_OPT $QUIET $SPLASH$extra_kopt ---
482
495
        initrd  $CASPER_INITRD\$casper_flavour
483
496
}
484
497
EOF
485
498
done
486
499
    cat >> $CDDIR/boot/grub/loopback.cfg <<EOF
487
 
menuentry "${livelabel#^}" {
 
500
menuentry "${livelabelgrub#^}" {
488
501
        set gfxpayload=keep
489
 
        linux   $CASPER_KERNEL\$casper_flavour $KERNEL_PARAMS $DEFAULT_PRESEED$liveparams$LAYERFS_PATH_OPT iso-scan/filename=\${iso_path} $QUIET $SPLASH ---
 
502
        linux   $CASPER_KERNEL\$casper_flavour $KERNEL_PARAMS $DEFAULT_PRESEED$liveparamsgrub$LAYERFS_PATH_OPT iso-scan/filename=\${iso_path} $QUIET $SPLASH ---
490
503
        initrd  $CASPER_INITRD\$casper_flavour
491
504
}
492
505
EOF
500
513
  kernel $CASPER_KERNEL
501
514
  append $KERNEL_PARAMS $DEFAULT_PRESEED$LAYERFS_PATH_OPT only-ubiquity initrd=$CASPER_INITRD $QUIET $SPLASH$extra_kopt ---
502
515
EOF
 
516
        if [ "$NOTRYONLYDOINGRUB" != "true" ]; then
503
517
            cat >> $CDDIR/boot/grub/grub.cfg <<EOF
504
518
menuentry "Install $HUMANPROJECT${suffix}" {
505
519
        set gfxpayload=keep
507
521
        initrd  $CASPER_INITRD\$casper_flavour
508
522
}
509
523
EOF
 
524
        fi
510
525
        done
 
526
    if [ "$NOTRYONLYDOINGRUB" != "true" ]; then
511
527
        cat >> $CDDIR/boot/grub/loopback.cfg <<EOF
512
528
menuentry "Install $HUMANPROJECT" {
513
529
        linux   $CASPER_KERNEL\$casper_flavour $KERNEL_PARAMS $DEFAULT_PRESEED$LAYERFS_PATH_OPT only-ubiquity iso-scan/filename=\${iso_path} $QUIET $SPLASH ---
515
531
}
516
532
EOF
517
533
    fi
 
534
    fi
518
535
    cat >> boot$N/isolinux/gfxboot.cfg <<EOF
519
536
label driverupdates=Use driver update disc
520
537
append driverupdates=debian-installer/driver-update=true