From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Mon, 2 Oct 2023 12:29:32 +0000 (+0200)
Subject: Merge pull request #29343 from DaanDeMeyer/tmp
X-Git-Tag: v255-rc1~366
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1e5e902f60fdaf6c88f5ffb5c15b84f3e9afe60b;p=thirdparty%2Fsystemd.git

Merge pull request #29343 from DaanDeMeyer/tmp

Use a subdirectory of /run/systemd for PrivateDevices=
---

1e5e902f60fdaf6c88f5ffb5c15b84f3e9afe60b
diff --cc src/core/namespace.c
index f0521e80703,a0471ac8884..206453f30f9
--- a/src/core/namespace.c
+++ b/src/core/namespace.c
@@@ -1902,9 -1896,10 +1928,9 @@@ static int apply_mounts
                                  break;
                          }
  
-                         r = apply_one_mount(root, m, mount_image_policy, extension_image_policy, ns_info);
+                         r = apply_one_mount(root, m, mount_image_policy, extension_image_policy, ns_info, scope);
                          if (r < 0) {
 -                                if (error_path && mount_entry_path(m))
 -                                        *error_path = strdup(mount_entry_path(m));
 +                                mount_entry_path_debug_string(root, m, error_path);
                                  return r;
                          }