From 997ba18af1bcc9982e2ffc622f993727a48960c5 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Fri, 8 Dec 2023 12:48:44 +0900 Subject: [PATCH] find-esp: do not skip fstype check even when --root= or --image= is specified The check was introduced by 63105f33edad423691e2d53bf7071f99c83799ba, but there is no reason to skip the check even in such cases. --- src/shared/find-esp.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/shared/find-esp.c b/src/shared/find-esp.c index 7fcdd32df54..bbfd3b175f3 100644 --- a/src/shared/find-esp.c +++ b/src/shared/find-esp.c @@ -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); -- 2.47.3