From: Matt DeVillier <matt.devillier@gmail.com>
Date: Sun, 24 May 2020 22:45:34 +0000 (-0500)
Subject: boot: Fix logic for boot menu display
X-Git-Tag: rel-1.14.0~10
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=926fd4e05e667e7835073ee7c8612c11e23dc57f;p=seabios.git

boot: Fix logic for boot menu display

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>
---

diff --git a/src/boot.c b/src/boot.c
index 03bd251..1f7fce1 100644
--- a/src/boot.c
+++ b/src/boot.c
@@ -687,7 +687,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