summaryrefslogtreecommitdiff
path: root/units
diff options
context:
space:
mode:
Diffstat (limited to 'units')
-rw-r--r--units/syslog.socket5
-rw-r--r--units/syslog.target19
-rw-r--r--units/systemd-journald.socket2
3 files changed, 2 insertions, 24 deletions
diff --git a/units/syslog.socket b/units/syslog.socket
index c784357627..e6e9cf8525 100644
--- a/units/syslog.socket
+++ b/units/syslog.socket
@@ -10,14 +10,11 @@ Description=Syslog Socket
Documentation=man:systemd.special(7)
Documentation=http://www.freedesktop.org/wiki/Software/systemd/syslog
DefaultDependencies=no
-Before=sockets.target syslog.target shutdown.target
+Before=sockets.target shutdown.target
# Don't allow logging until the very end
Conflicts=shutdown.target
-# Pull in syslog.target to tell people that /dev/log is now accessible
-Wants=syslog.target
-
[Socket]
ListenDatagram=/run/systemd/journal/syslog
SocketMode=0666
diff --git a/units/syslog.target b/units/syslog.target
deleted file mode 100644
index 423fef30ad..0000000000
--- a/units/syslog.target
+++ /dev/null
@@ -1,19 +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 Lesser General Public License as published by
-# the Free Software Foundation; either version 2.1 of the License, or
-# (at your option) any later version.
-
-# This exists mostly for compatibility with SysV/LSB units, and
-# implementations lacking socket/bus activation.
-
-[Unit]
-Description=Syslog
-Documentation=man:systemd.special(7)
-Documentation=http://www.freedesktop.org/wiki/Software/systemd/syslog
-
-# Avoid that we conflict with shutdown.target, so that we can stay
-# until the very end and do not cancel shutdown.target if we should
-# happen to be activated very late.
-DefaultDependencies=no
diff --git a/units/systemd-journald.socket b/units/systemd-journald.socket
index dbe8882c0e..4f0619d258 100644
--- a/units/systemd-journald.socket
+++ b/units/systemd-journald.socket
@@ -9,7 +9,7 @@
Description=Journal Socket
Documentation=man:systemd-journald.service(8) man:journald.conf(5)
DefaultDependencies=no
-Before=sockets.target syslog.target
+Before=sockets.target
# Mount and swap units need this. If this socket unit is removed by an
# isolate request the mount and and swap units would be removed too,