From d8c9d3a468e61ee2a2b2c3454e662398b0885411 Mon Sep 17 00:00:00 2001 From: Zbigniew Jędrzejewski-Szmek Date: Tue, 22 Oct 2013 20:39:18 -0400 Subject: systemd: use unit name in PrivateTmp directories Unit name is used whole in the directory name, so that the unit name can be easily extracted from it, e.g. "/tmp/systemd-abcd.service-DEDBIF1". https://bugzilla.redhat.com/show_bug.cgi?id=957439 --- src/core/namespace.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'src/core/namespace.c') diff --git a/src/core/namespace.c b/src/core/namespace.c index 936f36839b..b453f8dc09 100644 --- a/src/core/namespace.c +++ b/src/core/namespace.c @@ -184,26 +184,29 @@ static int make_read_only(BindMount *m) { return 0; } -int setup_tmpdirs(char **tmp_dir, +int setup_tmpdirs(const char *unit_id, + char **tmp_dir, char **var_tmp_dir) { int r = 0; - char tmp_dir_template[] = "/tmp/systemd-private-XXXXXX", - var_tmp_dir_template[] = "/var/tmp/systemd-private-XXXXXX"; + _cleanup_free_ char *tmp = NULL, *var = NULL; assert(tmp_dir); assert(var_tmp_dir); - r = create_tmp_dir(tmp_dir_template, tmp_dir); + tmp = strjoin("/tmp/systemd-", unit_id, "-XXXXXXX", NULL); + var = strjoin("/var/tmp/systemd-", unit_id, "-XXXXXXX", NULL); + + r = create_tmp_dir(tmp, tmp_dir); if (r < 0) return r; - r = create_tmp_dir(var_tmp_dir_template, var_tmp_dir); + r = create_tmp_dir(var, var_tmp_dir); if (r == 0) return 0; /* failure */ rmdir(*tmp_dir); - rmdir(tmp_dir_template); + rmdir(tmp); free(*tmp_dir); *tmp_dir = NULL; -- cgit v1.2.3-54-g00ecf