From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 21 Nov 2024 11:16:57 +0000 (+0100)
Subject: nspawn: fix userns_mkdir() invocation
X-Git-Tag: v257-rc3~44
X-Git-Url: http://git-history.diyao.me/?a=commitdiff_plain;h=2bd290ca026860aae71fcb8f45f3dbb07a84d928;p=systemd%2F.git

nspawn: fix userns_mkdir() invocation

The wrong error code was logged.

But actually given that userns_mkdir() is fine with existing dirs, let's
drop the redundant conditionalization.

Follow-up for: a1fcaa1549d86098d0ba75254b6afc96c786b3b6
---

diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
index 5dd289c1b4..0a8f1af821 100644
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -2280,10 +2280,9 @@ static int copy_devnode_one(const char *dest, const char *node, bool ignore_mkno
         r = path_extract_directory(from, &parent);
         if (r < 0)
                 return log_error_errno(r, "Failed to extract directory from %s: %m", from);
-        if (!path_equal(parent, "/dev/")) {
-                if (userns_mkdir(dest, parent, 0755, 0, 0) < 0)
-                        return log_error_errno(r, "Failed to create directory %s: %m", parent);
-        }
+        r = userns_mkdir(dest, parent, 0755, 0, 0);
+        if (r < 0)
+                return log_error_errno(r, "Failed to create directory %s: %m", parent);
 
         if (mknod(to, st.st_mode, st.st_rdev) < 0) {
                 r = -errno; /* Save the original error code. */