main: fix reexecution of systemd, use right path to binary

[elogind.git] / units / syslog.socket

diff --git a/units/syslog.socket b/units/syslog.socket
index c18da464391379bbd224f59fff5e44159c03686b..1c54857762385592dfea0a9089e200ff1caad7c3 100644 (file)
--- a/units/syslog.socket
+++ b/units/syslog.socket
@@ -10,18 +10,30 @@
 [Unit]
 Description=Syslog Socket
 DefaultDependencies=no
-Before=sockets.target
+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=/dev/log
+ListenDatagram=/run/systemd/journal/syslog
 SocketMode=0666
+PassCredentials=yes
+ReceiveBuffer=8M
 
-# 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