chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
7346249
)
core: --user -- move generator directories from /tmp to $XDG_RUNTIME_DIR
author
Kay Sievers
<kay@vrfy.org>
Mon, 6 Jan 2014 03:50:26 +0000
(07:50 +0400)
committer
Kay Sievers
<kay@vrfy.org>
Mon, 6 Jan 2014 17:35:13 +0000
(
01:35
+0800)
src/core/manager.c
patch
|
blob
|
history
diff --git
a/src/core/manager.c
b/src/core/manager.c
index bbe5efa560a4500a604f9aa37b6b44f5430d8b1e..0e35ba5cab9134d3364bbdf30e00a2bff88a3b21 100644
(file)
--- a/
src/core/manager.c
+++ b/
src/core/manager.c
@@
-2507,11
+2507,29
@@
static int create_generator_dir(Manager *m, char **generator, const char *name)
return 0;
if (m->running_as == SYSTEMD_SYSTEM && getpid() == 1) {
return 0;
if (m->running_as == SYSTEMD_SYSTEM && getpid() == 1) {
+ /* systemd --system, not running --test */
p = strappend("/run/systemd/", name);
if (!p)
return log_oom();
p = strappend("/run/systemd/", name);
if (!p)
return log_oom();
+ r = mkdir_p_label(p, 0755);
+ if (r < 0) {
+ log_error("Failed to create generator directory %s: %s",
+ p, strerror(-r));
+ free(p);
+ return r;
+ }
+ } else if (m->running_as == SYSTEMD_USER) {
+ const char *s = NULL;
+
+ s = getenv("XDG_RUNTIME_DIR");
+ if (!s)
+ return -EINVAL;
+ p = strjoin(s, "/systemd/", name, NULL);
+ if (!p)
+ return log_oom();
+
r = mkdir_p_label(p, 0755);
if (r < 0) {
log_error("Failed to create generator directory %s: %s",
r = mkdir_p_label(p, 0755);
if (r < 0) {
log_error("Failed to create generator directory %s: %s",
@@
-2520,6
+2538,8
@@
static int create_generator_dir(Manager *m, char **generator, const char *name)
return r;
}
} else {
return r;
}
} else {
+ /* systemd --system --test */
+
p = strjoin("/tmp/systemd-", name, ".XXXXXX", NULL);
if (!p)
return log_oom();
p = strjoin("/tmp/systemd-", name, ".XXXXXX", NULL);
if (!p)
return log_oom();