From 3a76fbe01cd8aa2f709b800d25f20630cfc99948 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 2 Jul 2019 13:02:22 +0200 Subject: [PATCH] bootctl,sd-boot: define EFI_LOADER_FEATURE_XBOOTLDR It was added back in fa2a3bbdd8bfcc3402c2ad9e941eb3911971e09a, but we forgot to add the feature define. --- src/boot/bootctl.c | 11 ++++++----- src/boot/efi/boot.c | 1 + 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/boot/bootctl.c b/src/boot/bootctl.c index 368dd88f5f..7e64d13c7f 100644 --- a/src/boot/bootctl.c +++ b/src/boot/bootctl.c @@ -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; diff --git a/src/boot/efi/boot.c b/src/boot/efi/boot.c index f542f45ca0..4c3b39b57a 100644 --- a/src/boot/efi/boot.c +++ b/src/boot/efi/boot.c @@ -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;