]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
sysext: Fix ephemeral-import mode for unused hierarchies
authorKrzesimir Nowak <knowak@microsoft.com>
Thu, 11 Apr 2024 11:35:20 +0000 (13:35 +0200)
committerKrzesimir Nowak <knowak@microsoft.com>
Fri, 19 Apr 2024 05:20:49 +0000 (07:20 +0200)
src/sysext/sysext.c

index 87f55aca27d9a963a1a2e0936080636d4ed1680b..b8753083bffafa4fb514e973de6c815c56008188 100644 (file)
@@ -961,7 +961,11 @@ static int maybe_import_ignored_mutable_directory(OverlayFSPaths *op) {
                 return log_oom();
 
         r = chase(path, arg_root, CHASE_PREFIX_ROOT, &resolved_path, NULL);
-        if (r < 0 && r != -ENOENT)
+        if (r == -ENOENT) {
+                log_debug("Mutable directory for %s does not exist, not importing", op->hierarchy);
+                return 0;
+        }
+        if (r < 0)
                 return log_error_errno(r, "Failed to resolve mutable directory '%s': %m", path);
 
         r = resolved_paths_equal(op->resolved_hierarchy, resolved_path);