picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

manager: Ensure user's systemd runtime directory exists.

Browse source 
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
This commit is contained in:
Colin Guthrie 2014-11-02 13:33:16 +00:00
parent d704fda934
commit 0c3f25e0c1
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/core/manager.c
View file

@ -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));