shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2024-12-23 17:34:00 +03:00
Code

sd-stub: do not print warning if filesystem is not supported

Browse Source 
Do not print a warning in case we try to load the file system protocol for an
unsupported file system, just return EFI_SUCCESS instead.
This commit is contained in:
Alfonso Sánchez-Beato 2022-03-03 11:42:41 +01:00 committed by Luca Boccassi
parent f05a288135
commit 178d598b5f
1 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/boot/efi/cpio.c
View File

@ -324,6 +324,7 @@ EFI_STATUS pack_cpio(
_cleanup_freepool_ void *buffer = NULL;
UINT32 inode = 1; /* inode counter, so that each item gets a new inode */
EFI_STATUS err;
EFI_FILE_IO_INTERFACE *volume;
assert(loaded_image);
assert(target_dir_prefix);
@ -336,9 +337,24 @@ EFI_STATUS pack_cpio(
return EFI_SUCCESS;
}
root = LibOpenRoot(loaded_image->DeviceHandle);
if (!root)
return log_error_status_stall(EFI_LOAD_ERROR, L"Unable to open root directory.");
err = BS->HandleProtocol(loaded_image->DeviceHandle,
&FileSystemProtocol, (void*)&volume);
/* Error will be unsupported if the bootloader doesn't implement the
* file system protocol on its file handles.
*/
if (err == EFI_UNSUPPORTED) {
*ret_buffer = NULL;
*ret_buffer_size = 0;
return EFI_SUCCESS;
}
if (EFI_ERROR(err))
return log_error_status_stall(
err, L"Unable to load file system protocol: %r", err);
err = volume->OpenVolume(volume, &root);
if (EFI_ERROR(err))
return log_error_status_stall(
err, L"Unable to open root directory: %r", err);
if (!dropin_dir)
dropin_dir = rel_dropin_dir = xpool_print(L"%D.extra.d", loaded_image->FilePath);