Merge lp:~xnox/debian-cd/no-try-only-do-in-grub into lp:~ubuntu-cdimage/debian-cd/ubun3

[Dimitri John Ledkov]

focal: boot-amd64: allow different behaviour in isolinux & grub, w.r.t notry

Allow isolinux & grub labels and kernel-arg to be different. By default, keep them the same.

Allow doing NOTRYONLYDO mode, but just for grub, whilst keeping bios mode the same, with NOTRYONLYDOINGRUB.

Make Ubuntu flavour use NOTRYONLYDOINGRUB, such that isolinux remains the same, but under grub the only boot entry is "maybe-ubiquity" one.

This is work-in-progress, as I still need to test build a desktop ISO with this code, and check that ubuntu flavour works correctly and non-ubuntu flavour works correctly too.

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

2048. By Dimitri John Ledkov on 2020-04-12

focal: boot-amd64: allow different behaviour in isolinux & grub, w.r.t notry

[Dimitri John Ledkov (xnox)]

Bios boot remains the same, all options work, and translations preserved.

UEFI boot works as intended and goes into maybe-ubiquity mode, as per design review between Wimpress & mpt.

[Martin Wimpress  (flexiondotorg)]

I confirm that boot to maybe-ubiquity from EFI is the agreement from a meeting with design and foundations.

review: Approve

=== modified file 'tools/boot/focal/boot-amd64'
--- tools/boot/focal/boot-amd64	2020-04-09 20:51:06 +0000
+++ tools/boot/focal/boot-amd64	2020-04-12 15:13:04 +0000
@@ -459,11 +459,24 @@
             liveparams=
             NOTRYONLYDO=true
             ;;
+        ubuntu)
+            livelabel="^Try $HUMANPROJECT without installing"
+            liveparams=
+            livelabelgrub="^$HUMANPROJECT"
+            liveparamsgrub=' maybe-ubiquity'
+            NOTRYONLYDOINGRUB=true
+            ;;
         *)
             livelabel="^Try $HUMANPROJECT without installing"
             liveparams=
     esac
 
+    if [ -z "$livelabelgrub" ]; then
+        livelabelgrub="$livelabel"
+        liveparamsgrub="$liveparams"
+    fi
+    
+    
     LAYERFS_PATH_OPT=$(add_layerfs_path_opt)
 
 for variant in "" " (safe graphics)^ nomodeset"; do
@@ -476,17 +489,17 @@
   append $KERNEL_PARAMS $DEFAULT_PRESEED$liveparams$LAYERFS_PATH_OPT initrd=$CASPER_INITRD $QUIET $SPLASH$extra_kopt ---
 EOF
     cat >> $CDDIR/boot/grub/grub.cfg <<EOF
-menuentry "${livelabel#^}${suffix}" {
+menuentry "${livelabelgrub#^}${suffix}" {
 	set gfxpayload=keep
-	linux	$CASPER_KERNEL\$casper_flavour $KERNEL_PARAMS $DEFAULT_PRESEED$liveparams$LAYERFS_PATH_OPT $QUIET $SPLASH$extra_kopt ---
+	linux	$CASPER_KERNEL\$casper_flavour $KERNEL_PARAMS $DEFAULT_PRESEED$liveparamsgrub$LAYERFS_PATH_OPT $QUIET $SPLASH$extra_kopt ---
 	initrd	$CASPER_INITRD\$casper_flavour
 }
 EOF
 done
     cat >> $CDDIR/boot/grub/loopback.cfg <<EOF
-menuentry "${livelabel#^}" {
+menuentry "${livelabelgrub#^}" {
 	set gfxpayload=keep
-	linux	$CASPER_KERNEL\$casper_flavour $KERNEL_PARAMS $DEFAULT_PRESEED$liveparams$LAYERFS_PATH_OPT iso-scan/filename=\${iso_path} $QUIET $SPLASH ---
+	linux	$CASPER_KERNEL\$casper_flavour $KERNEL_PARAMS $DEFAULT_PRESEED$liveparamsgrub$LAYERFS_PATH_OPT iso-scan/filename=\${iso_path} $QUIET $SPLASH ---
 	initrd	$CASPER_INITRD\$casper_flavour
 }
 EOF
@@ -500,6 +513,7 @@
   kernel $CASPER_KERNEL
   append $KERNEL_PARAMS $DEFAULT_PRESEED$LAYERFS_PATH_OPT only-ubiquity initrd=$CASPER_INITRD $QUIET $SPLASH$extra_kopt ---
 EOF
+        if [ "$NOTRYONLYDOINGRUB" != "true" ]; then
 	    cat >> $CDDIR/boot/grub/grub.cfg <<EOF
 menuentry "Install $HUMANPROJECT${suffix}" {
 	set gfxpayload=keep
@@ -507,7 +521,9 @@
 	initrd	$CASPER_INITRD\$casper_flavour
 }
 EOF
+        fi
 	done
+    if [ "$NOTRYONLYDOINGRUB" != "true" ]; then
 	cat >> $CDDIR/boot/grub/loopback.cfg <<EOF
 menuentry "Install $HUMANPROJECT" {
 	linux	$CASPER_KERNEL\$casper_flavour $KERNEL_PARAMS $DEFAULT_PRESEED$LAYERFS_PATH_OPT only-ubiquity iso-scan/filename=\${iso_path} $QUIET $SPLASH ---
@@ -515,6 +531,7 @@
 }
 EOF
     fi
+    fi
     cat >> boot$N/isolinux/gfxboot.cfg <<EOF
 label driverupdates=Use driver update disc
 append driverupdates=debian-installer/driver-update=true