Merge pull request #21981 from medhefgo/boot-cleanup

[thirdparty/systemd.git] / src / boot / efi / drivers.c

diff --git a/src/boot/efi/drivers.c b/src/boot/efi/drivers.c
index ce5cf3dcd740e19811864907455d9d9c6714ec61..851203e694d3342943270a72187cded96812e754 100644 (file)
--- 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;
@@ -77,7 +82,7 @@ EFI_STATUS load_drivers(
                 EFI_LOADED_IMAGE *loaded_image,
                 EFI_FILE_HANDLE root_dir) {
 
-        _cleanup_(FileHandleClosep) EFI_FILE_HANDLE drivers_dir = NULL;
+        _cleanup_(file_handle_closep) EFI_FILE_HANDLE drivers_dir = NULL;
         _cleanup_freepool_ EFI_FILE_INFO *dirent = NULL;
         UINTN dirent_size = 0, n_succeeded = 0;
         EFI_STATUS err;