summaryrefslogtreecommitdiffstats
path: root/src/sysext
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2023-09-28 18:24:11 +0200
committerLennart Poettering <lennart@poettering.net>2023-10-05 19:10:06 +0200
commit95515896f686106c5d10da25f7f72be662657019 (patch)
treeeafb6a5b98b02daa4020ef2a48a724575991820c /src/sysext
parentdiscover-image: nicely support .sysext.raw + .confext.raw suffix for DDIs (diff)
downloadsystemd-95515896f686106c5d10da25f7f72be662657019.tar.xz
systemd-95515896f686106c5d10da25f7f72be662657019.zip
sysext: fix some sysextisms in confext mode
Nothing earth-shattering. Just make sure we never expose the string "sysext" in "confext" mode.
Diffstat (limited to 'src/sysext')
-rw-r--r--src/sysext/sysext.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/sysext/sysext.c b/src/sysext/sysext.c
index 33bfb3dc80..784accc15d 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;