Merge lp:~mwhudson/debian-cd/change-grub-labels into lp:~ubuntu-cdimage/debian-cd/ubun3

[Michael Hudson-Doyle]

This doesn't really depend on the other branches but I'm too lazy to remember how to rebase things in bzr.

[Steve Langasek (vorlon)]

Dimitri, I think this came in as part of your changes, was this a deliberate change w/ input from Design?

[Steve Langasek (vorlon)]

review: Needs Information

[Dimitri John Ledkov (xnox)]

On Wed, 8 Jul 2020, 19:26 Steve Langasek, <email address hidden>
wrote:

> Dimitri, I think this came in as part of your changes, was this a
> deliberate change w/ input from Design?
>

It was deliberate yes.

Input from Design -> not quite completely of the things changed.

We used to have a mix of wording of:
- nothing shown / hidden
- Install $flavour
- Try $flavour
- Start $flavour

Depending on boot mode & flavour.

General guidance is to keep install time menu, same as installed one.

For groovy all flavours, in all modes, just use "$flavour".

With Hidden/Install/Try/Start all dropped.

As all flavours in groovy boot to a live session, which can be user
interactively, for recovery, or to complete the install.

Please do not introduce divergence, or impose "Install" which was used by
minority of flavours.

Please note "Install $foo" comes from the days of separate live & install
media, as well as jumbo media that required a reboot if one wanted to
install versus complete the install. Yet for more than a decade now, we had
live session that can do everything.

[Michael Hudson-Doyle (mwhudson)]

OK this makes sense I guess.

The thing that prompted me to send this is that I get confused sometimes as to whether it's the installer media or the existing install that's booting. But maybe that's a bit niche.

Unmerged revisions

2080. By Michael Hudson-Doyle on 2020-07-08

change grub menu labels to "Install $HUMANPROJECT"

=== modified file 'tools/boot/groovy/boot-amd64'
--- tools/boot/groovy/boot-amd64	2020-07-08 04:10:51 +0000
+++ tools/boot/groovy/boot-amd64	2020-07-08 04:10:51 +0000
@@ -123,7 +123,7 @@
 set menu_color_normal=white/black
 set menu_color_highlight=black/light-gray
 
-menuentry "$HUMANPROJECT" {
+menuentry "Install $HUMANPROJECT" {
 	set gfxpayload=keep
 	linux	/casper/vmlinuz $KERNEL_PARAMS
 	initrd	/casper/initrd
@@ -133,7 +133,7 @@
 # All but server get safe-graphics mode
 if [ "$PROJECT" != "ubuntu-server" ]; then
     cat >> $CDDIR/boot/grub/grub.cfg <<EOF
-menuentry "$HUMANPROJECT (safe graphics)" {
+menuentry "Install $HUMANPROJECT (safe graphics)" {
 	set gfxpayload=keep
 	linux	/casper/vmlinuz nomodeset $KERNEL_PARAMS
 	initrd	/casper/initrd