Merge lp:~cyphermox/debian-cd/timeouts into lp:~ubuntu-cdimage/debian-cd/ubun3

[Mathieu Trudel-Lapierre]

Better set timeouts for some flavours:

- Booting through GRUB (UEFI, non-gfxboot arches) should still timeout eventually and proceed to the default boot entry.
- ubuntu-server LIVE builds (subiquity) can timeout even earlier, after two seconds like desktop images without even showing keyboard options (but showing the accessibility icon at the bottom of the screen).

[Steve Langasek (vorlon)]

Suggested improvements inline.

review: Needs Fixing

[Steve Langasek (vorlon)]

On Wed, Nov 22, 2017 at 11:34:53PM -0000, Mathieu Trudel-Lapierre wrote:

> Diff comments:

> > === modified file 'tools/boot/bionic/boot-amd64'
> > --- tools/boot/bionic/boot-amd64 2017-11-08 04:58:14 +0000
> > +++ tools/boot/bionic/boot-amd64 2017-11-22 22:54:26 +0000
> > @@ -202,7 +202,7 @@
> > HIDDEN_TIMEOUT=
> > if [ "$CDIMAGE_LIVE" = 1 ] && [ "$CDIMAGE_DVD" != 1 ]; then
> > case $PROJECT in
> > - ubuntu|ubuntu-netbook|xubuntu|ubuntukylin|kubuntu|kubuntu-plasma5|ubuntu-gnome|ubuntu-desktop-next|ubuntu-mate|ubuntu-budgie)
> > + ubuntu|ubuntu-netbook|xubuntu|ubuntukylin|kubuntu|kubuntu-plasma5|ubuntu-gnome|ubuntu-desktop-next|ubuntu-mate|ubuntu-budgie|ubuntu-server)

> This is a special case though, it only applies to live & gfxboot; not to
> grub. I agree it could be listed as exceptions, but I think there just
> aren't any. (I certainly can't think of one). For example, I think
> lubuntu is simply missing from that list (but should be in).

But it would still be better, in terms of maintainability and principle of
least surprise, to treat this as the default case (if we think it should be
default) and only call out the exceptions.

(If Lubuntu currently gets different behavior as a result of not being in
this list, then it should be called out as an exception. We shouldn't
change the behavior of Lubuntu as a part of this MP.)

> > HIDDEN_TIMEOUT=2
> > ;;
> > mythbuntu)
> > @@ -313,6 +313,13 @@
> > : > boot$N/isolinux/hwe-gfxboot.cfg
> > fi
> >
> > +# Set a timeout for GRUB; 15 seconds for everyone since users don't need to
> > +# pick a language, but should still have time to decide what boot option
> > +# (Try, Install, HWE, etc.) they want.
> > +cat >> $CDDIR/boot/grub/grub.cfg <<EOF
> > +set timeout=15
> > +EOF
> > +

> There's currently some variability in the timeout, based on HIDDEN_TIMEOUT
> above and if unset, then only having a timeout in the keyboard selection
> prompts in gfxboot (300 (30 sec) if HIDDEN_TIMEOUT is unset, 50 (5 sec)
> otherwise); which changes what the user is "looking at" while the timeout
> counts down.

> I'm all for standardizing, but let's first agree on some standard, as well
> as where we "time out".

Yes, the timeout for gfxboot varies based on the HIDDEN_TIMEOUT setting.
But we capture that timeout value in a variable, and I see no reason why,
*for a given image*, we should not be using that same timeout value for both
grub and gfxboot.

[Steve Langasek (vorlon)]

review: Needs Fixing

[Mathieu Trudel-Lapierre (cyphermox)]

Inline comments. I'm fixing the pass for lubuntu; but the other change is on purpose.

[Steve Langasek (vorlon)]

> Inline comments. I'm fixing the pass for lubuntu; but the other change is on
> purpose.

OK. It would be better to have this clearly called out in the commit history; right now it looks like an unintended side-effect of a refactor.

[Steve Langasek (vorlon)]

review: Approve

[lp:~cyphermox/debian-cd/timeouts]

1983. By Mathieu Trudel-Lapierre on 2017-11-29

Rework menu timeouts for images and make sure GRUB shares the same timeout values.

1984. By Mathieu Trudel-Lapierre on 2017-11-29

Standardize on 30 seconds timeout for server images booted in UEFI or BIOS mode. This is no change for live images that do no use hidden-timeout, they already had a timeout of 30 seconds.

[Simon Quigley (tsimonq2)]

What about Lubuntu Next (lubuntu-next)? Shouldn't that be there?

=== modified file 'tools/boot/bionic/boot-amd64'
--- tools/boot/bionic/boot-amd64	2017-11-08 04:58:14 +0000
+++ tools/boot/bionic/boot-amd64	2017-11-29 19:41:23 +0000
@@ -202,12 +202,16 @@
 HIDDEN_TIMEOUT=
 if [ "$CDIMAGE_LIVE" = 1 ] && [ "$CDIMAGE_DVD" != 1 ]; then
     case $PROJECT in
-	ubuntu|ubuntu-netbook|xubuntu|ubuntukylin|kubuntu|kubuntu-plasma5|ubuntu-gnome|ubuntu-desktop-next|ubuntu-mate|ubuntu-budgie)
-	    HIDDEN_TIMEOUT=2
-	    ;;
 	mythbuntu)
 	    HIDDEN_TIMEOUT=1
 	    ;;
+	lubuntu)
+	    # Lubuntu appears to be an exception, being a live image but not
+	    # using hidden timeout.
+	    ;;
+	*)
+	    HIDDEN_TIMEOUT=2
+	    ;;
     esac
     if [ -e "$BASEDIR/data/$DI_CODENAME/$PROJECT-access.pcx" ]; then
 	ACCESSPCX="$PROJECT-access.pcx"
@@ -313,6 +317,25 @@
     : > boot$N/isolinux/hwe-gfxboot.cfg
 fi
 
+# Menu timeout, in seconds.
+# gfxboots will need it in deciseconds (it is converted as needed)
+menu_timeout=30
+
+# When using hidden timeout; use a shorter timeout while the user
+# only sees the accessibility logo at the bottom of the screen.
+if [ "$HIDDEN_TIMEOUT" ]; then
+    menu_timeout=5
+fi
+
+# Set timeout for the GRUB menu
+cat >> $CDDIR/boot/grub/grub.cfg <<EOF
+set timeout=$menu_timeout
+EOF
+
+# Set gfxboot timeouts (for hidden-timeout or for the language picker)
+sed -i "s/^timeout .*/timeout $(($menu_timeout * 10))/" \
+    boot$N/isolinux/isolinux.cfg boot$N/isolinux/prompt.cfg
+
 # Set up-to-date build dates. Kludgy because d-i sets its own version as
 # the build date.
 DI_VERSION="$(perl -lne 'if (/built on ([0-9a-z]*)/) { print $1 }' \
@@ -323,15 +346,6 @@
 	"boot$N"/isolinux/*.txt "boot$N"/isolinux/*.hlp
 fi
 
-if [ "$HIDDEN_TIMEOUT" ]; then
-    timeout=50
-elif [ "$CDIMAGE_LIVE" = 1 ]; then
-    timeout=300
-else
-    timeout=0
-fi
-sed -i "s/^timeout .*/timeout $timeout/" \
-    boot$N/isolinux/isolinux.cfg boot$N/isolinux/prompt.cfg
 # Isolinux config file.
 if [ "$CDIMAGE_LIVE" = 1 ]; then
     DEFAULT_LABEL=live

=== modified file 'tools/boot/bionic/boot-arm64'
--- tools/boot/bionic/boot-arm64	2017-11-08 04:58:14 +0000
+++ tools/boot/bionic/boot-arm64	2017-11-29 19:41:23 +0000
@@ -152,6 +152,11 @@
 #mcopy -i $CDDIR/boot/grub/efi.img ::EFI/BOOT/bootaa64.efi $CDDIR/EFI/BOOT/bootaa64.efi
 sed -i '/^menuentry/Q' $CDDIR/boot/grub/grub.cfg
 
+# Set a timeout for grub.
+cat >> $CDDIR/boot/grub/grub.cfg <<EOF
+set timeout=30
+EOF
+
 if [ "$BACKPORT_KERNEL" ]; then
     cat > $CDDIR/boot/grub/hwe-grub.cfg <<EOF
 submenu 'Boot and Install with the HWE kernel' {

=== modified file 'tools/boot/bionic/boot-ppc64el'
--- tools/boot/bionic/boot-ppc64el	2017-11-08 04:58:14 +0000
+++ tools/boot/bionic/boot-ppc64el	2017-11-29 19:41:23 +0000
@@ -108,6 +108,11 @@
 # setup grub menu
 sed -i '/^menuentry/Q' $CDDIR/boot/grub/grub.cfg
 
+# Set a timeout for GRUB
+cat >> $CDDIR/boot/grub/grub.cfg <<EOF
+set timeout=30
+EOF
+
 if [ "$BACKPORT_KERNEL" ]; then
     cat > $CDDIR/boot/grub/hwe-grub.cfg <<EOF
 submenu 'Boot and Install with the HWE kernel' {