X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=units%2Fsyslog.socket;h=657e7913e34d89cb906732ab38b9106ef9b0aeab;hb=f9873976499de5c90c703e04a3bee96848fc90c8;hp=f9e3171522628b15e5dd62239cd120edc8d2e3f8;hpb=dc1ecd78e9f046880d10ddb45cf9b06df1084b10;p=elogind.git

diff --git a/units/syslog.socket b/units/syslog.socket
index f9e317152..657e7913e 100644
--- a/units/syslog.socket
+++ b/units/syslog.socket
@@ -11,21 +11,28 @@
 Description=Syslog Socket
 DefaultDependencies=no
 Before=sockets.target syslog.target
+Conflicts=shutdown.target
+Before=shutdown.target
 
 # Pull in syslog.target to tell people that /dev/log is now accessible
 Wants=syslog.target
 
 [Socket]
-ListenDatagram=/run/systemd/syslog
+ListenDatagram=/run/systemd/journal/syslog
 SocketMode=0666
-PassCred=yes
+PassCredentials=yes
 
-# The service we activate on incoming traffic is
-# systemd-kmsg-syslogd.service. That doesn't mean however, that this
-# is the main syslog daemon in the system. Another syslog
-# implementation (which might be started via on-boot or another
-# non-socket activation) can take over possession of the socket and
-# terminate systemd-kmsg-syslogd. It could also simply replace the
-# socket in the file system, and leave systemd-kmsg-syslogd untouched.
-
-Service=systemd-kmsg-syslogd.service
+# The default syslog implementation should make syslog.service a
+# symlink to itself, so that this socket activates the right actual
+# syslog service.
+#
+# Examples:
+#
+# /etc/systemd/system/syslog.service -> /lib/systemd/system/rsyslog.service
+# /etc/systemd/system/syslog.service -> /lib/systemd/system/syslog-ng.service
+#
+# Best way to achieve that is by adding this to your unit file
+# (i.e. to rsyslog.service or syslog-ng.service):
+#
+# [Install]
+# Alias=syslog.service