summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Guthrie <colin@mageia.org>2014-11-02 13:33:16 +0000
committerColin Guthrie <colin@mageia.org>2014-11-05 14:49:06 +0000
commit0c3f25e0c1f028d4da9cc5253abf0322230e6835 (patch)
treef5c1eb10277480fc93c990d1f51ed2c5b8946485
parentd704fda9347f3019fd2a14881bcb6df640c36a80 (diff)
manager: Ensure user's systemd runtime directory exists.
This mirrors code in dbus.c when creating the private socket and avoids error messages like: systemd[1353]: bind(/run/user/603/systemd/notify) failed: No such file or directory systemd[1353]: Failed to fully start up daemon: No such file or directory
-rw-r--r--src/core/manager.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/src/core/manager.c b/src/core/manager.c
index ef1e3eac5f..129f6dd3a8 100644
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -662,9 +662,11 @@ static int manager_setup_notify(Manager *m) {
return -errno;
}
- if (m->running_as == SYSTEMD_SYSTEM)
+ if (m->running_as == SYSTEMD_SYSTEM) {
m->notify_socket = strdup("/run/systemd/notify");
- else {
+ if (!m->notify_socket)
+ return log_oom();
+ } else {
const char *e;
e = getenv("XDG_RUNTIME_DIR");
@@ -674,9 +676,11 @@ static int manager_setup_notify(Manager *m) {
}
m->notify_socket = strappend(e, "/systemd/notify");
+ if (!m->notify_socket)
+ return log_oom();
+
+ mkdir_parents_label(m->notify_socket, 0755);
}
- if (!m->notify_socket)
- return log_oom();
strncpy(sa.un.sun_path, m->notify_socket, sizeof(sa.un.sun_path)-1);
r = bind(fd, &sa.sa, offsetof(struct sockaddr_un, sun_path) + strlen(sa.un.sun_path));