From eacd29fed7268839c99336767f7e68a3561c5cf4 Mon Sep 17 00:00:00 2001 From: Nathan O'Meara Date: Thu, 27 Jun 2024 13:32:00 -0400 Subject: [PATCH] make EFI_HTTP_ERROR work directly Signed-off-by: Nathan O'Meara --- shim.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/shim.c b/shim.c index 6cf6985b9..fec0799c1 100644 --- a/shim.c +++ b/shim.c @@ -1262,8 +1262,9 @@ EFI_STATUS init_grub(EFI_HANDLE image_handle) // default loader if we get a TFTP error or HTTP error. if (!use_fb && (efi_status == EFI_INVALID_PARAMETER || efi_status == EFI_NOT_FOUND || - // TODO: Add EFI_HTTP_ERROR when gnu-efi is updated to a version that includes it - // efi_status == EFI_HTTP_ERROR || + // TODO: Change to EFI_HTTP_ERROR when gnu-efi is updated to a version that includes it + // I already get error 35 on my test systems, even with this build of shim. + efi_status == EFIERR(35) || efi_status == EFI_TFTP_ERROR)) { console_print( L"start_image() returned %r, falling back to default loader\n",