boot: Extend `etc/show-boot-menu` to configure skipping boot menu with only one device

Concerns were raised, that skipping the boot menu, if only one device is
present, might make debugging issues more difficult. So, extend the
current runtime configuration option `etc/show-boot-menu` to enable this
feature by setting it to 2.

Fixes: 29ee1fb8 ("Skip boot menu and timeout with only one boot device")
Signed-off-by: Paul Menzel <pmenzel@molgen.mpg.de>

1 files changed, 3 insertions, 2 deletions

diff --git a/src/boot.c b/src/boot.c
index cc87b1d..a395347 100644
--- a/src/boot.c
+++ b/src/boot.c
@@ -685,12 +685,13 @@ void
 interactive_bootmenu(void)
 {
     // XXX - show available drives?
+    u64 show_boot_menu = romfile_loadint("etc/show-boot-menu", 1);
 
-    if (! CONFIG_BOOTMENU || !romfile_loadint("etc/show-boot-menu", 1))
+    if (! CONFIG_BOOTMENU || show_boot_menu != 0)
         return;
 
     // skip menu if only one boot device and no TPM
-    if ((NULL == BootList.first->next) && !tpm_can_show_menu()) {
+    if ((show_boot_menu == 2) && (NULL == BootList.first->next) && !tpm_can_show_menu()) {
        printf("\n");
        return;
     }