From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 28 Sep 2023 16:24:11 +0000 (+0200)
Subject: sysext: fix some sysextisms in confext mode
X-Git-Tag: v255-rc1~319^2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=95515896f686106c5d10da25f7f72be662657019;p=thirdparty%2Fsystemd.git

sysext: fix some sysextisms in confext mode

Nothing earth-shattering. Just make sure we never expose the string
"sysext" in "confext" mode.
---

diff --git a/src/sysext/sysext.c b/src/sysext/sysext.c
index 33bfb3dc80a..784accc15d0 100644
--- a/src/sysext/sysext.c
+++ b/src/sysext/sysext.c
@@ -591,13 +591,13 @@ static int merge_subprocess(Hashmap *images, const char *workspace) {
         /* Let's create the workspace if it's missing */
         r = mkdir_p(workspace, 0700);
         if (r < 0)
-                return log_error_errno(r, "Failed to create /run/systemd/sysext: %m");
+                return log_error_errno(r, "Failed to create '%s': %m", workspace);
 
         /* Let's mount a tmpfs to our workspace. This way we don't need to clean up the inodes we mount over,
          * but let the kernel do that entirely automatically, once our namespace dies. Note that this file
          * system won't be visible to anyone but us, since we opened our own namespace and then made the
          * /run/ hierarchy (which our workspace is contained in) MS_SLAVE, see above. */
-        r = mount_nofollow_verbose(LOG_ERR, "sysext", workspace, "tmpfs", 0, "mode=0700");
+        r = mount_nofollow_verbose(LOG_ERR, image_class_info[arg_image_class].short_identifier, workspace, "tmpfs", 0, "mode=0700");
         if (r < 0)
                 return r;