Commit c61193d3 [boot: Extend `etc/show-boot-menu`...] changed the logic surrounding the use of show_boot_menu incorrectly, leading the boot menu to be skipped by default with no way to override. Correct the logic error so that show_boot_menu works as documented.
Test: build/boot SeaBIOS, verify boot menu option shown by default.
Signed-off-by: Matt DeVillier matt.devillier@gmail.com --- src/boot.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/boot.c b/src/boot.c index 994b592f..58c13add 100644 --- a/src/boot.c +++ b/src/boot.c @@ -697,7 +697,7 @@ interactive_bootmenu(void) // XXX - show available drives? u64 show_boot_menu = romfile_loadint("etc/show-boot-menu", 1);
- if (! CONFIG_BOOTMENU || show_boot_menu != 0) + if (! CONFIG_BOOTMENU || show_boot_menu == 0) return;
// skip menu if only one boot device and no TPM
On Sun, May 24, 2020 at 05:45:34PM -0500, Matt DeVillier wrote:
Commit c61193d3 [boot: Extend `etc/show-boot-menu`...] changed the logic surrounding the use of show_boot_menu incorrectly, leading the boot menu to be skipped by default with no way to override. Correct the logic error so that show_boot_menu works as documented.
Test: build/boot SeaBIOS, verify boot menu option shown by default.
Thanks. I committed this along with some additional fixes.
-Kevin
-
Kevin O'Connor -
Matt DeVillier