diff options
| author | Lennart Poettering <lennart@poettering.net> | 2013-01-16 21:09:03 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2013-01-16 21:34:09 +0100 |
| commit | 5d4caf565471ff3401bd9b53aa814c8545a18a93 (patch) | |
| tree | 1e6dc444c24402a81d1d895a9698b80ae110e6a0 /units | |
| parent | a485210ce73fe1186fdc5fae481dc31773e14b3c (diff) | |
service: ignore dependencies on $syslog and $local_fs in LSB scripts
We no longer allow early-boot init scripts, however in late boot the
syslog socket and local mounts are established anyway, so let's simplify
our dep graph a bit.
If $syslog doesn't resolve to syslog.target anymore there's no reason to
keep syslog.target around anymore. Let's remove it.
Note that many 3rd party service unit files order themselves after
syslog.target. These will be dangling dependencies now, which should be
unproblematic, however.
Diffstat (limited to 'units')
| -rw-r--r-- | units/syslog.socket | 5 | ||||
| -rw-r--r-- | units/syslog.target | 19 | ||||
| -rw-r--r-- | units/systemd-journald.socket | 2 |
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, |