From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 15 May 2023 10:32:54 +0000 (+0200)
Subject: pid1: port unit namespacing to new /run/systemd/mount-rootfs dir
X-Git-Tag: v254-rc1~468^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=be79c23569f7e4065a5a26dbf15612bce28e6bb3;p=thirdparty%2Fsystemd.git

pid1: port unit namespacing to new /run/systemd/mount-rootfs dir
---

diff --git a/src/core/namespace.c b/src/core/namespace.c
index 2fcc096217d..1116ece59d8 100644
--- a/src/core/namespace.c
+++ b/src/core/namespace.c
@@ -2166,10 +2166,11 @@ int setup_namespace(
                  * in the root. The temporary directory prevents any mounts from being potentially obscured
                  * my other mounts we already applied.  We use the same mount point for all images, which is
                  * safe, since they all live in their own namespaces after all, and hence won't see each
-                 * other. */
+                 * other. (Note: this directory is also created by PID 1 early on, we create it here for
+                 * similar reasons as /run/systemd/ first.) */
+                root = "/run/systemd/mount-rootfs";
+                (void) mkdir_label(root, 0555);
 
-                root = "/run/systemd/unit-root";
-                (void) mkdir_label(root, 0700);
                 require_prefix = true;
         }