diff options
| author |   Colin Guthrie <colin@mageia.org> | 2014-11-02 13:33:16 +0000 |
|---|---|---|
| committer |   Mike Gilbert <floppym@gentoo.org> | 2014-11-23 13:23:14 -0500 |
| commit | cbaabb2168b6bd497a813b74fb378027e0c921fc (patch) | |
| tree | 372def6e9f4fd248a334565182485f7406b88684 | |
| parent | udev: Fix parsing of udev.event-timeout kernel parameter. (diff) | |
| download | systemd-cbaabb2168b6bd497a813b74fb378027e0c921fc.tar.gz systemd-cbaabb2168b6bd497a813b74fb378027e0c921fc.tar.bz2 systemd-cbaabb2168b6bd497a813b74fb378027e0c921fc.zip | |
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.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/core/manager.c b/src/core/manager.c index d427d88d4..256d6f727 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)); |