diff options
author | Jan Janssen <medhefgo@web.de> | 2021-09-30 12:51:32 +0200 |
---|---|---|
committer | Jan Janssen <medhefgo@web.de> | 2021-10-17 11:56:05 +0200 |
commit | 53f69d671c024698d5911a984ef8888ad4523fc1 (patch) | |
tree | af62fbe205151f8a0a12c4f097c26f50b9792482 /src/boot/efi/boot.c | |
parent | 12f32748aa291db1e8c1305e7fb4310e9728aad4 (diff) | |
download | systemd-53f69d671c024698d5911a984ef8888ad4523fc1.tar.gz |
sd-boot: Require gnu-efi 3.0.5
This version is from 2017 and should be stale enough to not cause
an outrage. All the relevant distros have it or a newer version.
We also already depend on some symbols defined in 3.0.5 anyway,
so let's take the opportunity to reduce our missing_efi.h
baggage.
Diffstat (limited to 'src/boot/efi/boot.c')
-rw-r--r-- | src/boot/efi/boot.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/boot/efi/boot.c b/src/boot/efi/boot.c index fcbf50fc0e..6c4ddb1939 100644 --- a/src/boot/efi/boot.c +++ b/src/boot/efi/boot.c @@ -26,10 +26,6 @@ #error systemd-boot requires compilation with GNU_EFI_USE_MS_ABI defined. #endif -#ifndef EFI_OS_INDICATIONS_BOOT_TO_FW_UI -#define EFI_OS_INDICATIONS_BOOT_TO_FW_UI 0x0000000000000001ULL -#endif - #define TEXT_ATTR_SWAP(c) EFI_TEXT_ATTR(((c) & 0b11110000) >> 4, (c) & 0b1111) /* magic string to find in the binary image */ @@ -1266,7 +1262,6 @@ static void config_entry_bump_counters( _cleanup_freepool_ CHAR16* old_path = NULL, *new_path = NULL; _cleanup_(FileHandleClosep) EFI_FILE_HANDLE handle = NULL; - static const EFI_GUID EfiFileInfoGuid = EFI_FILE_INFO_ID; _cleanup_freepool_ EFI_FILE_INFO *file_info = NULL; UINTN file_info_size; EFI_STATUS err; @@ -1292,7 +1287,7 @@ static void config_entry_bump_counters( /* And rename the file */ StrCpy(file_info->FileName, entry->next_name); - err = handle->SetInfo(handle, (EFI_GUID*) &EfiFileInfoGuid, file_info_size, file_info); + err = handle->SetInfo(handle, &GenericFileInfo, file_info_size, file_info); if (EFI_ERROR(err)) { log_error_stall(L"Failed to rename '%s' to '%s', ignoring: %r", old_path, entry->next_name, err); return; |