diff options
| author | Lennart Poettering <lennart@poettering.net> | 2011-12-31 00:59:37 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2011-12-31 00:59:37 +0100 |
| commit | dc1ecd78e9f046880d10ddb45cf9b06df1084b10 (patch) | |
| tree | 696491346a7fa69f8620a99cb7c0d2d87f2da7cf /units | |
| parent | 69b1c67463de64fb32ba75f586f0c9d2716f3e02 (diff) | |
| parent | 74ef2d16ada74db3059d825ce8d24ea74946bf8f (diff) | |
Merge branch 'journal'
Diffstat (limited to 'units')
| -rw-r--r-- | units/.gitignore | 1 | ||||
| -rw-r--r-- | units/syslog.socket | 2 | ||||
| -rw-r--r-- | units/systemd-journald.service.in | 24 | ||||
| -rw-r--r-- | units/systemd-journald.socket | 24 |
4 files changed, 50 insertions, 1 deletions
diff --git a/units/.gitignore b/units/.gitignore index cc92c73022..94412d52e7 100644 --- a/units/.gitignore +++ b/units/.gitignore @@ -1,3 +1,4 @@ +/systemd-journald.service user@.service systemd-logind.service systemd-localed.service diff --git a/units/syslog.socket b/units/syslog.socket index e74b55948e..f9e3171522 100644 --- a/units/syslog.socket +++ b/units/syslog.socket @@ -16,7 +16,7 @@ Before=sockets.target syslog.target Wants=syslog.target [Socket] -ListenDatagram=/dev/log +ListenDatagram=/run/systemd/syslog SocketMode=0666 PassCred=yes diff --git a/units/systemd-journald.service.in b/units/systemd-journald.service.in new file mode 100644 index 0000000000..2cfc68482e --- /dev/null +++ b/units/systemd-journald.service.in @@ -0,0 +1,24 @@ +# This file is part of systemd. +# +# systemd is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. + +# See systemd.special(7) for details + +[Unit] +Description=Journal Service +DefaultDependencies=no +Requires=systemd-journald.socket +After=systemd-journald.socket + +[Service] +ExecStart=@rootlibexecdir@/systemd-journald +NotifyAccess=all +StandardOutput=null +#CapabilityBoundingSet=CAP_SYS_ADMIN CAP_SETUID CAP_SETGID + +# Increase the default a bit in order to allow many simultaneous +# services being run since we keep one fd open per service. +LimitNOFILE=16384 diff --git a/units/systemd-journald.socket b/units/systemd-journald.socket new file mode 100644 index 0000000000..b439bc1fdc --- /dev/null +++ b/units/systemd-journald.socket @@ -0,0 +1,24 @@ +# This file is part of systemd. +# +# systemd is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. + +# See systemd.special(7) for details + +[Unit] +Description=Journal Socket +DefaultDependencies=no +Before=sockets.target syslog.target + +# Mount and swap units need this. If this socket unit is removed by an +# isolate request the mount and and swap units would be removed too, +# hence let's exclude this from isolate requests. +IgnoreOnIsolate=yes + +[Socket] +ListenStream=/run/systemd/stdout +ListenDatagram=/run/systemd/native +ListenDatagram=/dev/log +SocketMode=0666 |