]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
find-esp: do not skip fstype check even when --root= or --image= is specified
authorYu Watanabe <watanabe.yu+github@gmail.com>
Fri, 8 Dec 2023 03:48:44 +0000 (12:48 +0900)
committerYu Watanabe <watanabe.yu+github@gmail.com>
Wed, 13 Dec 2023 05:19:28 +0000 (14:19 +0900)
The check was introduced by 63105f33edad423691e2d53bf7071f99c83799ba,
but there is no reason to skip the check even in such cases.

src/shared/find-esp.c

index 7fcdd32df54cd4a219e318f8e9d946d1f710e1de..bbfd3b175f38a5486ec9a22c189db734e81e0e0e 100644 (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);