]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
bootctl,sd-boot: define EFI_LOADER_FEATURE_XBOOTLDR 13009/head
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Tue, 2 Jul 2019 11:02:22 +0000 (13:02 +0200)
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Wed, 10 Jul 2019 13:02:33 +0000 (15:02 +0200)
It was added back in fa2a3bbdd8bfcc3402c2ad9e941eb3911971e09a, but we
forgot to add the feature define.

src/boot/bootctl.c
src/boot/efi/boot.c

index 368dd88f5f8fb5d64089c3bc1611b5790ceb3e00..7e64d13c7f616b9e064f27929b1eaaaaecf2d1c4 100644 (file)
@@ -1156,11 +1156,12 @@ static int verb_status(int argc, char *argv[], void *userdata) {
                         uint64_t flag;
                         const char *name;
                 } flags[] = {
-                        { EFI_LOADER_FEATURE_BOOT_COUNTING,           "Boot counting"                 },
-                        { EFI_LOADER_FEATURE_CONFIG_TIMEOUT,          "Menu timeout control"          },
-                        { EFI_LOADER_FEATURE_CONFIG_TIMEOUT_ONE_SHOT, "One-shot menu timeout control" },
-                        { EFI_LOADER_FEATURE_ENTRY_DEFAULT,           "Default entry control"         },
-                        { EFI_LOADER_FEATURE_ENTRY_ONESHOT,           "One-shot entry control"        },
+                        { EFI_LOADER_FEATURE_BOOT_COUNTING,           "Boot counting"                  },
+                        { EFI_LOADER_FEATURE_CONFIG_TIMEOUT,          "Menu timeout control"           },
+                        { EFI_LOADER_FEATURE_CONFIG_TIMEOUT_ONE_SHOT, "One-shot menu timeout control"  },
+                        { EFI_LOADER_FEATURE_ENTRY_DEFAULT,           "Default entry control"          },
+                        { EFI_LOADER_FEATURE_ENTRY_ONESHOT,           "One-shot entry control"         },
+                        { EFI_LOADER_FEATURE_XBOOTLDR,                "Support for XBOOTLDR partition" },
                 };
 
                 _cleanup_free_ char *fw_type = NULL, *fw_info = NULL, *loader = NULL, *loader_path = NULL, *stub = NULL;
index f542f45ca0293ad73a5fb5df0a953fcdbe3d7dec..4c3b39b57a7ba6d10f1af23bf159de068bfbd844 100644 (file)
@@ -2283,6 +2283,7 @@ EFI_STATUS efi_main(EFI_HANDLE image, EFI_SYSTEM_TABLE *sys_table) {
                 EFI_LOADER_FEATURE_ENTRY_DEFAULT |
                 EFI_LOADER_FEATURE_ENTRY_ONESHOT |
                 EFI_LOADER_FEATURE_BOOT_COUNTING |
+                EFI_LOADER_FEATURE_XBOOTLDR |
                 0;
 
         _cleanup_freepool_ CHAR16 *infostr = NULL, *typestr = NULL;