Skip boot menu and timeout with only one boot device

Signed-off-by: Matt DeVillier <matt.devillier@gmail.com>
Signed-off-by: Paul Menzel <pmenzel@molgen.mpg.de>
Message-Id: <45aa3ebe-b97c-f1af-2901-ec4e9bcd1084@molgen.mpg.de>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>

diff --git a/src/boot.c b/src/boot.c
index afeb36a3319aa3fda858cbbf93a508c37d759b36..4f12988f687c17eefbe4fd5c8af805cfb11da2bf 100644 (file)
--- a/src/boot.c
+++ b/src/boot.c
@@ -670,6 +670,12 @@ interactive_bootmenu(void)
     if (! CONFIG_BOOTMENU || !romfile_loadint("etc/show-boot-menu", 1))
         return;
 
+    // skip menu if only one boot device and no TPM
+    if ((NULL == BootList.first->next) && !tpm_can_show_menu()) {
+       printf("\n");
+       return;
+    }
+
     while (get_keystroke(0) >= 0)
         ;