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 /units | |
| 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 'units')
| -rw-r--r-- | units/systemd-journald-dev-log.socket | 26 | ||||
| -rw-r--r-- | units/systemd-journald.service.in | 3 | ||||
| -rw-r--r-- | units/systemd-journald.socket | 2 |
3 files changed, 29 insertions, 2 deletions
diff --git a/units/systemd-journald-dev-log.socket b/units/systemd-journald-dev-log.socket new file mode 100644 index 000000000..c01b310b4 --- /dev/null +++ b/units/systemd-journald-dev-log.socket @@ -0,0 +1,26 @@ +# This file is part of systemd. +# +# systemd is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; either version 2.1 of the License, or +# (at your option) any later version. + +[Unit] +Description=Journal Socket (/dev/log) +Documentation=man:systemd-journald.service(8) man:journald.conf(5) +DefaultDependencies=no +Before=sockets.target + +# Mount and swap units need this. If this socket unit is removed by an +# isolate request the mount and swap units would be removed too, +# hence let's exclude this from isolate requests. +IgnoreOnIsolate=yes + +[Socket] +ListenDatagram=/run/systemd/journal/dev-log +Symlinks=/dev/log +SocketMode=0666 +PassCredentials=yes +PassSecurity=yes +ReceiveBuffer=8M +Service=systemd-journald.service diff --git a/units/systemd-journald.service.in b/units/systemd-journald.service.in index ba3f84720..4a307c708 100644 --- a/units/systemd-journald.service.in +++ b/units/systemd-journald.service.in @@ -10,10 +10,11 @@ Description=Journal Service Documentation=man:systemd-journald.service(8) man:journald.conf(5) DefaultDependencies=no Requires=systemd-journald.socket -After=systemd-journald.socket syslog.socket +After=systemd-journald.socket systemd-journald-dev-log.socket syslog.socket Before=sysinit.target [Service] +Sockets=systemd-journald.socket systemd-journald-dev-log.socket ExecStart=@rootlibexecdir@/systemd-journald Restart=always RestartSec=0 diff --git a/units/systemd-journald.socket b/units/systemd-journald.socket index fbeb10baa..71737014c 100644 --- a/units/systemd-journald.socket +++ b/units/systemd-journald.socket @@ -19,8 +19,8 @@ IgnoreOnIsolate=yes [Socket] ListenStream=/run/systemd/journal/stdout ListenDatagram=/run/systemd/journal/socket -ListenDatagram=/dev/log SocketMode=0666 PassCredentials=yes PassSecurity=yes ReceiveBuffer=8M +Service=systemd-journald.service |