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

diff --git a/Makefile.am b/Makefile.am
index 30d68a05106c11cd1d4ff9768d3193d8f32219c3..5fcf24f5de75c821a508958bd48e9c5e670dcc19 100644 (file)
--- 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 8ddbda91a6f290c4fa303a485677f8743c7d5ef6..2f89d0e63bc1d7ec405a27feb932cafac48e4478 100644 (file)
--- 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 860c3a646a52bbacced848520722f427f5f8cf61..54caa3c965284604219cf1e046edf65427b3dc39 100644 (file)
--- 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 d3427e6eebb6f31c9c2f79d0c0ed97af44a3ec39..3897b39d1a087694ee4b491529d715f7e1f47e19 100644 (file)
--- 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 f2f1a71530b881dd286e19613ad30d026d7f72ad..65a70559dafa056c26ef851c3fd613238885020a 100644 (file)
--- 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 f8ff21911d5ea669349b4b5eb15917132574a239..c527cc4ad0d3bebfb5e990fc4c7a4c70c25fa332 100644 (file)
--- 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 890f8fbca1f4a6220e36a1571b46aa699d974a0a..31309015ca110db068c24ddcd8a6d9d51bc086c1 100644 (file)
--- 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 3980e242117fe9a15c4bdc3d55cc0d39c54c7d04..afde58055bd0288bd4a6747f90d9d3b001a55539 100644 (file)
--- 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 (file)
index 0000000..c18da46
--- /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 78f16c8cb86953349b96686e1f3a2d390843f207..7df3aa6db372ae4040f98f797ca9309f1a32c5dd 100644 (file)
--- 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 bcb54b342454eb5575ef4c4e49f493000b6393c9..403b322c33359d751a44df5182dd520a8070abb6 100644 (file)
--- 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 e2e0f55b781fe39818ab2be3277def1a611c58ad..adb3750211a603026c6f6a05735c982cb24d189d 100644 (file)
--- 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 (file)
index ace06fa..0000000
--- 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 4d9b2c2710a3e9925651d67d1a58f1c7321b5ac0..d9708724e18fd229068f4dd71ec52b5599bec669 100644 (file)
--- 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 f62b582d3ef21267160224b60a4561ca5027e581..57244a28780c6c36d675a95246d3c51d84f746f8 100644 (file)
--- 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 8d437f55c40db2fb504f44901afd2aaf275aa626..2ccbe23c8c8d7696d9f9de7cec41d9e6845e6f79 100644 (file)
--- 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 292c3eded48fca2718108f7ea7d628836f9d5957..2214cafab236f987d44929b7d1648b64a717fe60 100644 (file)
--- 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 7652308e9013cb71f4bae97c1f34a9314a8a6a8d..0df24cff7787319ba79925d962b425945cda1c3e 100644 (file)
--- 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 87985ce3161c88c350c7009139ffbacf9eccfc5e..19760a906e7c439d09b76a9b11cf42a1d60c3c50 100644 (file)
--- 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