Merge lp:~xnox/debian-cd/ubuntu-fwsetup into lp:~ubuntu-cdimage/debian-cd/ubun3

Proposed by Dimitri John Ledkov
Status: Merged
Merged at revision: 2041
Proposed branch: lp:~xnox/debian-cd/ubuntu-fwsetup
Merge into: lp:~ubuntu-cdimage/debian-cd/ubun3
Diff against target: 38 lines (+14/-0)
1 file modified
tools/boot/focal/boot-amd64 (+14/-0)
To merge this branch: bzr merge lp:~xnox/debian-cd/ubuntu-fwsetup
Reviewer Review Type Date Requested Status
Steve Langasek Approve
Ubuntu CD Image Team Pending
Review via email: mp+376639@code.launchpad.net

Commit message

Add firmware setup menu entry on EFI grub platforms.

Description of the change

Add firmware setup menu entry on EFI grub platforms.

To post a comment you must log in.
Revision history for this message
Steve Langasek (vorlon) wrote :

What's the rationale for a firmware setup menu entry? On installed systems, we offer this because if UEFI fastboot is enabled it may be the only way to select a non-default boot option. But how would a system with UEFI fastboot have ever booted the installer image in the first place? And, having booted it, why would the user need a system setup menu option, instead of either a) proceeding to install, or b) removing the installer from the system and rebooting?

review: Needs Information
Revision history for this message
Dimitri John Ledkov (xnox) wrote :

The delay on EDK2 / OVMF builds to enter setup mode is too short, because it takes a while for SPICE to connect the keyabord. So I need it on VMs to enter setup when doing iso testing.

It's not unrealistic for people to miss the window when one can enter bios on real hardware by default. As one has to do it whilst the screen is completely black. I.e. on my dell laptop I choose to add a 30s boot delay in bios settings, as the window to enter bios settings was too short for me.

lp:~xnox/debian-cd/ubuntu-fwsetup updated
2043. By Dimitri John Ledkov

Add boot from next target menuentry.

Revision history for this message
Dimitri John Ledkov (xnox) wrote :

Steve, updated. Please re-review.

Revision history for this message
Steve Langasek (vorlon) wrote :

ok, I was -1 on the idea of using fwsetup as a replacement for the "Boot next device" option, but I can see that the rationale for having this on installed systems also applies equally well to live images (even though in practice it would be unusual for a system to both be configured with UEFI fastboot and have the live image as the first boot option that you can't remove). So I'm +1 on adding both of these.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'tools/boot/focal/boot-amd64'
--- tools/boot/focal/boot-amd64 2019-10-18 23:26:51 +0000
+++ tools/boot/focal/boot-amd64 2020-01-15 16:36:51 +0000
@@ -551,6 +551,8 @@
551EOF551EOF
552 fi552 fi
553fi553fi
554# No OEM mode on ubuntu-server live
555if ! ([ "$PROJECT" = ubuntu-server ] && [ "$CDIMAGE_LIVE" = 1 ]); then
554# The GRUB versions of this only correspond to single isolinux labels,556# The GRUB versions of this only correspond to single isolinux labels,
555# because we don't yet have the necessary technology in our GRUB menu stack557# because we don't yet have the necessary technology in our GRUB menu stack
556# to have a two-dimensional set of boot options, as is implemented for558# to have a two-dimensional set of boot options, as is implemented for
@@ -584,6 +586,7 @@
584EOF586EOF
585fi587fi
586done588done
589fi # No OEM mode on ubuntu-server live
587if [ "$CDIMAGE_INSTALL_BASE" = 1 ]; then590if [ "$CDIMAGE_INSTALL_BASE" = 1 ]; then
588 if [ "$PROJECT" != ubuntu-server ]; then591 if [ "$PROJECT" != ubuntu-server ]; then
589 cat >> boot$N/isolinux/gfxboot.cfg <<EOF592 cat >> boot$N/isolinux/gfxboot.cfg <<EOF
@@ -713,6 +716,17 @@
713 linux16 /install/mt86plus716 linux16 /install/mt86plus
714}717}
715EOF718EOF
719cat >> $CDDIR/boot/grub/grub.cfg <<EOF
720grub_platform
721if [ "\$grub_platform" = "efi" ]; then
722menuentry 'Boot from next target' {
723 exit
724}
725menuentry 'System setup' {
726 fwsetup
727}
728fi
729EOF
716fi730fi
717731
718if [ "$BACKPORT_KERNEL" ] && [ "$PROJECT" = ubuntu-server ]; then732if [ "$BACKPORT_KERNEL" ] && [ "$PROJECT" = ubuntu-server ]; then

Subscribers

People subscribed via source and target branches