summaryrefslogtreecommitdiff
path: root/src/journal/journald-server.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2014-06-04 16:37:02 +0200
committerLennart Poettering <lennart@poettering.net>2014-06-04 16:53:58 +0200
commit03ee5c38cb0da193dd08733fb4c0c2809cee6a99 (patch)
tree7dd08d7c90b63c8d66e46feb0fd4d1c473172b77 /src/journal/journald-server.c
parent02ba8fb3357daf57f6120ac512fb464a4c623419 (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/journal/journald-server.c')
-rw-r--r--src/journal/journald-server.c3
1 files changed, 2 insertions, 1 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.");