syslog: enable kmsg bridge by default and enable syslogging for early boot services

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 )

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

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

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

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

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

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

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

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

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]

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
 

units/systemd-kmsg-syslogd.service.in

@@ -14,3 +14,4 @@ DefaultDependencies=no
 [Service]
 ExecStart=@rootlibexecdir@/systemd-kmsg-syslogd
 NotifyAccess=all
+Sockets=syslog.socket

units/systemd-kmsg-syslogd.socket

@@ -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

units/systemd-logger.service.in

@@ -8,9 +8,9 @@
 # See systemd.special(7) for details
 
 [Unit]
-Description=systemd Logging Daemon
+Description=Logging Daemon
-Wants=syslog.target
+DefaultDependencies=no
-After=syslog.target @SPECIAL_SYSLOG_SERVICE@
+After=syslog.socket
 
 [Service]
 ExecStart=@rootlibexecdir@/systemd-logger

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

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

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]

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
 

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