diff options
author | Jan Janssen <medhefgo@web.de> | 2022-01-02 14:37:32 +0100 |
---|---|---|
committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2022-01-04 16:25:33 +0100 |
commit | 1c4c566d8602bdcbd56d94ddb5539d2235b0a0a6 (patch) | |
tree | df50addaf387312ab5c2920b473e01e4d13236f1 | |
parent | c563e3ef7761f89ac4643df08ef59c054f2d0135 (diff) | |
download | systemd-1c4c566d8602bdcbd56d94ddb5539d2235b0a0a6.tar.gz |
boot: Do not warn if an initializing driver returns EFI_ABORTED
Fixes: #21965
(cherry picked from commit 8fb16fee96a1563738e7fa784fc45d152b8c2694)
-rw-r--r-- | src/boot/efi/drivers.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/boot/efi/drivers.c b/src/boot/efi/drivers.c index ce5cf3dcd7..61df20e24a 100644 --- a/src/boot/efi/drivers.c +++ b/src/boot/efi/drivers.c @@ -43,8 +43,13 @@ static EFI_STATUS load_one_driver( return log_error_status_stall(EFI_INVALID_PARAMETER, L"Image %s is not a driver, refusing: %r", fname); err = BS->StartImage(image, NULL, NULL); - if (EFI_ERROR(err)) - return log_error_status_stall(err, L"Failed to start image %s: %r", fname, err); + if (EFI_ERROR(err)) { + /* EFI_ABORTED signals an initializing driver. It uses this error code on success + * so that it is unloaded after. */ + if (err != EFI_ABORTED) + log_error_stall(L"Failed to start image %s: %r", fname, err); + return err; + } TAKE_PTR(image); return EFI_SUCCESS; |