From: Krzesimir Nowak <knowak@microsoft.com>
Date: Thu, 11 Apr 2024 11:35:20 +0000 (+0200)
Subject: sysext: Fix ephemeral-import mode for unused hierarchies
X-Git-Tag: v256-rc1~86^2~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=080203639b2d425e0ffce16458d6775407afa713;p=thirdparty%2Fsystemd.git

sysext: Fix ephemeral-import mode for unused hierarchies
---

diff --git a/src/sysext/sysext.c b/src/sysext/sysext.c
index 87f55aca27d..b8753083bff 100644
--- a/src/sysext/sysext.c
+++ b/src/sysext/sysext.c
@@ -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);