From 03ee5c38cb0da193dd08733fb4c0c2809cee6a99 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 4 Jun 2014 16:37:02 +0200 Subject: 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. --- src/journal/journald-server.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/journal/journald-server.c') 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."); -- cgit v1.2.3-54-g00ecf