From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Fri, 8 Dec 2023 03:48:44 +0000 (+0900)
Subject: find-esp: do not skip fstype check even when --root= or --image= is specified
X-Git-Tag: v256-rc1~1473^2~5
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=997ba18af1bcc9982e2ffc622f993727a48960c5;p=thirdparty%2Fsystemd.git

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.
---

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);