19 files changed, 51 insertions, 31 deletions
diff --git a/Makefile.am b/Makefile.am
index 30d68a0510..5fcf24f5de 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -185,7 +185,7 @@ dist_systemunit_DATA = \
 	units/systemd-initctl.socket \
 	units/systemd-logger.socket \
 	units/systemd-shutdownd.socket \
-	units/systemd-kmsg-syslogd.socket \
+	units/syslog.socket \
 	units/dev-hugepages.automount \
 	units/dev-hugepages.mount \
 	units/dev-mqueue.automount \
@@ -1048,10 +1048,11 @@ install-data-hook:
 		rm -f session && \
 		$(LN_S) $(pkgsysconfdir)/session session )
 	( cd $(DESTDIR)$(systemunitdir)/sockets.target.wants && \
-		rm -f systemd-initctl.socket systemd-logger.socket systemd-shutdownd.socket && \
+		rm -f systemd-initctl.socket systemd-logger.socket systemd-shutdownd.socket syslog.socket && \
 		$(LN_S) ../systemd-logger.socket systemd-logger.socket && \
 		$(LN_S) ../systemd-initctl.socket systemd-initctl.socket && \
-		$(LN_S) ../systemd-shutdownd.socket systemd-shutdownd.socket )
+		$(LN_S) ../systemd-shutdownd.socket systemd-shutdownd.socket && \
+		$(LN_S) ../syslog.socket syslog.socket )
 	( cd $(DESTDIR)$(systemunitdir)/runlevel1.target.wants && \
 		rm -f systemd-update-utmp-runlevel.service && \
 		$(LN_S) ../systemd-update-utmp-runlevel.service systemd-update-utmp-runlevel.service )
diff --git a/units/fsck-root.service.in b/units/fsck-root.service.in
index 8ddbda91a6..2f89d0e63b 100644
--- a/units/fsck-root.service.in
+++ b/units/fsck-root.service.in
@@ -15,4 +15,5 @@ Before=local-fs.target shutdown.target remount-rootfs.service quotacheck.service
 Type=oneshot
 RemainAfterExit=no
 ExecStart=@rootlibexecdir@/systemd-fsck
+StandardOutput=syslog
 FsckPassNo=1
diff --git a/units/fsck@.service.in b/units/fsck@.service.in
index 860c3a646a..54caa3c965 100644
--- a/units/fsck@.service.in
+++ b/units/fsck@.service.in
@@ -16,3 +16,4 @@ Before=local-fs.target shutdown.target
 Type=oneshot
 RemainAfterExit=no
 ExecStart=@rootlibexecdir@/systemd-fsck %f
+StandardOutput=syslog
diff --git a/units/hwclock-load.service b/units/hwclock-load.service
index d3427e6eeb..3897b39d1a 100644
--- a/units/hwclock-load.service
+++ b/units/hwclock-load.service
@@ -15,6 +15,7 @@ Before=basic.target shutdown.target udev.service
 Type=oneshot
 RemainAfterExit=yes
 ExecStart=/sbin/hwclock --systz
+StandardOutput=syslog
 
 # Note the weird semantics if hwclock and the kernel here: the first
 # settimeofday() invocation from userspace is special and may be used
diff --git a/units/quotacheck.service.in b/units/quotacheck.service.in
index f2f1a71530..65a70559da 100644
--- a/units/quotacheck.service.in
+++ b/units/quotacheck.service.in
@@ -16,6 +16,7 @@ ConditionPathExists=/sbin/quotacheck
 Type=oneshot
 RemainAfterExit=yes
 ExecStart=@rootlibexecdir@/systemd-quotacheck
+StandardOutput=syslog
 
 [Install]
 WantedBy=local-fs.target
diff --git a/units/quotaon.service b/units/quotaon.service
index f8ff21911d..c527cc4ad0 100644
--- a/units/quotaon.service
+++ b/units/quotaon.service
@@ -16,6 +16,7 @@ ConditionPathExists=/sbin/quotaon
 Type=oneshot
 RemainAfterExit=yes
 ExecStart=/sbin/quotaon -aug
+StandardOutput=syslog
 
 [Install]
 WantedBy=local-fs.target
diff --git a/units/remount-rootfs.service b/units/remount-rootfs.service
index 890f8fbca1..31309015ca 100644
--- a/units/remount-rootfs.service
+++ b/units/remount-rootfs.service
@@ -16,3 +16,4 @@ Before=local-fs.target shutdown.target
 Type=oneshot
 RemainAfterExit=yes
 ExecStart=/bin/mount / -o remount
+StandardOutput=syslog
diff --git a/units/sysctl.service b/units/sysctl.service
index 3980e24211..afde58055b 100644
--- a/units/sysctl.service
+++ b/units/sysctl.service
@@ -16,3 +16,4 @@ Before=basic.target shutdown.target
 Type=oneshot
 RemainAfterExit=yes
 ExecStart=/sbin/sysctl -e -q -p /etc/sysctl.conf
+StandardOutput=syslog
diff --git a/units/syslog.socket b/units/syslog.socket
new file mode 100644
index 0000000000..c18da46439
--- /dev/null
+++ b/units/syslog.socket
@@ -0,0 +1,27 @@
+#  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=Syslog Socket
+DefaultDependencies=no
+Before=sockets.target
+
+[Socket]
+ListenDatagram=/dev/log
+SocketMode=0666
+
+# 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
diff --git a/units/systemd-initctl.service.in b/units/systemd-initctl.service.in
index 78f16c8cb8..7df3aa6db3 100644
--- a/units/systemd-initctl.service.in
+++ b/units/systemd-initctl.service.in
@@ -8,7 +8,7 @@
 # See systemd.special(7) for details
 
 [Unit]
-Description=systemd /dev/initctl Compatibility Daemon
+Description=/dev/initctl Compatibility Daemon
 DefaultDependencies=no
 
 [Service]
diff --git a/units/systemd-initctl.socket b/units/systemd-initctl.socket
index bcb54b3424..403b322c33 100644
--- a/units/systemd-initctl.socket
+++ b/units/systemd-initctl.socket
@@ -8,7 +8,7 @@
 # See systemd.special(7) for details
 
 [Unit]
-Description=systemd /dev/initctl Compatibility Socket
+Description=/dev/initctl Compatibility Socket
 DefaultDependencies=no
 Before=sockets.target
 
diff --git a/units/systemd-kmsg-syslogd.service.in b/units/systemd-kmsg-syslogd.service.in
index e2e0f55b78..adb3750211 100644
--- a/units/systemd-kmsg-syslogd.service.in
+++ b/units/systemd-kmsg-syslogd.service.in
@@ -14,3 +14,4 @@ DefaultDependencies=no
 [Service]
 ExecStart=@rootlibexecdir@/systemd-kmsg-syslogd
 NotifyAccess=all
+Sockets=syslog.socket
diff --git a/units/systemd-kmsg-syslogd.socket b/units/systemd-kmsg-syslogd.socket
deleted file mode 100644
index ace06fa563..0000000000
--- a/units/systemd-kmsg-syslogd.socket
+++ /dev/null
@@ -1,20 +0,0 @@
-#  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=Syslog Socket
-DefaultDependencies=no
-Before=sockets.target
-
-[Socket]
-ListenDatagram=/dev/log
-SocketMode=0666
-
-[Install]
-WantedBy=basic.target
diff --git a/units/systemd-logger.service.in b/units/systemd-logger.service.in
index 4d9b2c2710..d9708724e1 100644
--- a/units/systemd-logger.service.in
+++ b/units/systemd-logger.service.in
@@ -8,9 +8,9 @@
 # See systemd.special(7) for details
 
 [Unit]
-Description=systemd Logging Daemon
-Wants=syslog.target
-After=syslog.target @SPECIAL_SYSLOG_SERVICE@
+Description=Logging Daemon
+DefaultDependencies=no
+After=syslog.socket
 
 [Service]
 ExecStart=@rootlibexecdir@/systemd-logger
diff --git a/units/systemd-logger.socket b/units/systemd-logger.socket
index f62b582d3e..57244a2878 100644
--- a/units/systemd-logger.socket
+++ b/units/systemd-logger.socket
@@ -8,7 +8,9 @@
 # See systemd.special(7) for details
 
 [Unit]
-Description=systemd Logging Socket
+Description=Logging Socket
+DefaultDependencies=no
+Before=sockets.target
 
 [Socket]
 ListenStream=@/org/freedesktop/systemd1/logger
diff --git a/units/systemd-remount-api-vfs.service.in b/units/systemd-remount-api-vfs.service.in
index 8d437f55c4..2ccbe23c8c 100644
--- a/units/systemd-remount-api-vfs.service.in
+++ b/units/systemd-remount-api-vfs.service.in
@@ -16,3 +16,4 @@ Before=local-fs.target shutdown.target
 Type=oneshot
 RemainAfterExit=yes
 ExecStart=@rootlibexecdir@/systemd-remount-api-vfs
+StandardOutput=syslog
diff --git a/units/systemd-shutdownd.service.in b/units/systemd-shutdownd.service.in
index 292c3eded4..2214cafab2 100644
--- a/units/systemd-shutdownd.service.in
+++ b/units/systemd-shutdownd.service.in
@@ -8,7 +8,7 @@
 # See systemd.special(7) for details
 
 [Unit]
-Description=systemd Delayed Shutdown Daemon
+Description=Delayed Shutdown Daemon
 DefaultDependencies=no
 
 [Service]
diff --git a/units/systemd-shutdownd.socket b/units/systemd-shutdownd.socket
index 7652308e90..0df24cff77 100644
--- a/units/systemd-shutdownd.socket
+++ b/units/systemd-shutdownd.socket
@@ -8,7 +8,7 @@
 # See systemd.special(7) for details
 
 [Unit]
-Description=systemd Delayed Shutdown Socket
+Description=Delayed Shutdown Socket
 DefaultDependencies=no
 Before=sockets.target
 
diff --git a/units/systemd-vconsole-setup.service.in b/units/systemd-vconsole-setup.service.in
index 87985ce316..19760a906e 100644
--- a/units/systemd-vconsole-setup.service.in
+++ b/units/systemd-vconsole-setup.service.in
@@ -16,3 +16,4 @@ Before=basic.target shutdown.target
 Type=oneshot
 RemainAfterExit=yes
 ExecStart=@rootlibexecdir@/systemd-vconsole-setup
+StandardOutput=syslog