From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 23 Oct 2018 11:43:10 +0000 (+0200)
Subject: sd-boot: make sure special menu items also work if menu is skipped
X-Git-Tag: v240~305^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=996daf2fa9ee54065c7c14affae95682b5e744d9;p=thirdparty%2Fsystemd.git

sd-boot: make sure special menu items also work if menu is skipped

While it doesn't really make much sense to set "auto-reboot-to-firmware"
as oneshot boot item, let's still support it properly, by also
dispatching such a menu item if selected.
---

diff --git a/src/boot/efi/boot.c b/src/boot/efi/boot.c
index e62c7663355..d3a26fd7a0e 100644
--- a/src/boot/efi/boot.c
+++ b/src/boot/efi/boot.c
@@ -2215,12 +2215,12 @@ EFI_STATUS efi_main(EFI_HANDLE image, EFI_SYSTEM_TABLE *sys_table) {
                         uefi_call_wrapper(BS->SetWatchdogTimer, 4, 0, 0x10000, 0, NULL);
                         if (!menu_run(&config, &entry, loaded_image_path))
                                 break;
+                }
 
-                        /* run special entry like "reboot" */
-                        if (entry->call) {
-                                entry->call();
-                                continue;
-                        }
+                /* run special entry like "reboot" */
+                if (entry->call) {
+                        entry->call();
+                        continue;
                 }
 
                 config_entry_bump_counters(entry, root_dir);