journald: add CAP_MAC_OVERRIDE in journald for SMACK issue

[elogind.git] / units / systemd-journald.service.in

diff --git a/units/systemd-journald.service.in b/units/systemd-journald.service.in
index d169b44a876169a26335ca197883924463f51dc4..4de38fad59cb71cc6df066cf15892b8e94cbc89f 100644 (file)
--- a/units/systemd-journald.service.in
+++ b/units/systemd-journald.service.in
@@ -7,17 +7,21 @@
 
 [Unit]
 Description=Journal Service
-Documentation=man:systemd-journald.service(7) man:journald.conf(5)
+Documentation=man:systemd-journald.service(8) man:journald.conf(5)
 DefaultDependencies=no
 Requires=systemd-journald.socket
-After=systemd-journald.socket
-After=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
 NotifyAccess=all
 StandardOutput=null
-CapabilityBoundingSet=CAP_SYS_ADMIN CAP_DAC_OVERRIDE CAP_SYS_PTRACE CAP_SYSLOG CAP_AUDIT_CONTROL CAP_CHOWN CAP_DAC_READ_SEARCH CAP_FOWNER CAP_SETUID CAP_SETGID
+CapabilityBoundingSet=CAP_SYS_ADMIN CAP_DAC_OVERRIDE CAP_SYS_PTRACE CAP_SYSLOG CAP_AUDIT_CONTROL CAP_CHOWN CAP_DAC_READ_SEARCH CAP_FOWNER CAP_SETUID CAP_SETGID CAP_MAC_OVERRIDE
+WatchdogSec=1min
 
 # Increase the default a bit in order to allow many simultaneous
 # services being run since we keep one fd open per service.