morgan/systemd
1
0
Fork 0
mirror of https://github.com/morgan9e/systemd synced 2026-04-14 08:25:20 +09:00
Code Issues Packages Projects Releases Wiki Activity

find-esp: do not skip fstype check even when --root= or --image= is specified

Browse Source 
The check was introduced by 63105f33ed,
but there is no reason to skip the check even in such cases.
This commit is contained in:
Yu Watanabe
2023-12-08 12:48:44 +09:00
parent 9bbd3c699c
commit 997ba18af1
1 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/shared/find-esp.c
View File

@@ -473,12 +473,6 @@ int find_esp_and_warn_at(
flags = verify_esp_flags_init(unprivileged_mode, "SYSTEMD_RELAX_ESP_CHECKS");
r = dir_fd_is_root_or_cwd(rfd);
if (r < 0)
return log_error_errno(r, "Failed to check if directory file descriptor is root: %m");
if (r == 0)
flags |= VERIFY_ESP_SKIP_FSTYPE_CHECK | VERIFY_ESP_SKIP_DEVICE_CHECK;
if (path)
return verify_esp(rfd, path, ret_path, ret_part, ret_pstart, ret_psize, ret_uuid, ret_devid, flags);