diff options
| author | Lennart Poettering <lennart@poettering.net> | 2014-06-04 16:37:02 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2014-06-04 16:53:58 +0200 |
| commit | 03ee5c38cb0da193dd08733fb4c0c2809cee6a99 (patch) | |
| tree | 7dd08d7c90b63c8d66e46feb0fd4d1c473172b77 /src | |
| parent | 02ba8fb3357daf57f6120ac512fb464a4c623419 (diff) | |
journald: move /dev/log socket to /run
This way we can make the socket also available for sandboxed apps that
have their own private /dev. They can now simply symlink the socket from
/dev.
Diffstat (limited to 'src')
| -rw-r--r-- | src/journal/journald-server.c | 3 | ||||
| -rw-r--r-- | src/journal/journald-syslog.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c index 381d80a938..3211773c27 100644 --- a/src/journal/journald-server.c +++ b/src/journal/journald-server.c @@ -1535,7 +1535,8 @@ int server_init(Server *s) { s->stdout_fd = fd; - } else if (sd_is_socket_unix(fd, SOCK_DGRAM, -1, "/dev/log", 0) > 0) { + } else if (sd_is_socket_unix(fd, SOCK_DGRAM, -1, "/dev/log", 0) > 0 || + sd_is_socket_unix(fd, SOCK_DGRAM, -1, "/run/systemd/journal/dev-log", 0) > 0) { if (s->syslog_fd >= 0) { log_error("Too many /dev/log sockets passed."); diff --git a/src/journal/journald-syslog.c b/src/journal/journald-syslog.c index 434eac428f..b826e23c01 100644 --- a/src/journal/journald-syslog.c +++ b/src/journal/journald-syslog.c @@ -428,7 +428,7 @@ int server_open_syslog_socket(Server *s) { if (s->syslog_fd < 0) { union sockaddr_union sa = { .un.sun_family = AF_UNIX, - .un.sun_path = "/dev/log", + .un.sun_path = "/run/systemd/journal/dev-log", }; s->syslog_fd = socket(AF_UNIX, SOCK_DGRAM|SOCK_CLOEXEC|SOCK_NONBLOCK, 0); |