Merge pull request #12267 from keszybz/udev-settle-warning

[thirdparty/systemd.git] / units / syslog.socket

diff --git a/units/syslog.socket b/units/syslog.socket
index d3987cb9a877f91fd6136fb3af75651a7a4fd5bc..c4b1cea2d606702bced6dcd346406757321e90cd 100644 (file)
--- a/units/syslog.socket
+++ b/units/syslog.socket
@@ -1,3 +1,5 @@
+#  SPDX-License-Identifier: LGPL-2.1+
+#
 #  This file is part of systemd.
 #
 #  systemd is free software; you can redistribute it and/or modify it
@@ -10,10 +12,15 @@ Description=Syslog Socket
 Documentation=man:systemd.special(7)
 Documentation=https://www.freedesktop.org/wiki/Software/systemd/syslog
 DefaultDependencies=no
-Before=sockets.target shutdown.target
+Before=sockets.target
 
 # Don't allow logging until the very end
 Conflicts=shutdown.target
+Before=shutdown.target
+
+# Don't try to activate syslog.service if sysinit.target has failed.
+Conflicts=emergency.service
+Before=emergency.service
 
 [Socket]
 ListenDatagram=/run/systemd/journal/syslog