diff options
| author | Lennart Poettering <lennart@poettering.net> | 2017-10-05 18:26:02 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-05 18:26:02 +0200 |
| commit | fdb63434844f53a14073000931263c7f81d82bab (patch) | |
| tree | 9a7cdb06a7fdca7b4760475fc29c0c34ae0f08c0 /units | |
| parent | 608f70e6b454020bfc8f807bd0f9d1c412d4157a (diff) | |
| parent | 2d4b910383c6c14b3720e26cca11c223ad868d9d (diff) | |
| download | systemd-fdb63434844f53a14073000931263c7f81d82bab.tar.gz | |
Merge pull request #6909 from sourcejedi/units
Unit dependency fixes (and cleanups)
Diffstat (limited to 'units')
| -rw-r--r-- | units/emergency.service.in | 2 | ||||
| -rw-r--r-- | units/machines.target | 3 | ||||
| -rw-r--r-- | units/syslog.socket | 7 | ||||
| -rw-r--r-- | units/system-update-cleanup.service.in | 1 | ||||
| -rw-r--r-- | units/system-update.target | 2 | ||||
| -rw-r--r-- | units/systemd-networkd-wait-online.service.in | 2 | ||||
| -rw-r--r-- | units/systemd-volatile-root.service.in | 1 |
7 files changed, 9 insertions, 9 deletions
diff --git a/units/emergency.service.in b/units/emergency.service.in index c60fd6e256..9a81fc4da9 100644 --- a/units/emergency.service.in +++ b/units/emergency.service.in @@ -11,8 +11,8 @@ Documentation=man:sulogin(8) DefaultDependencies=no Conflicts=shutdown.target Conflicts=rescue.service -Conflicts=syslog.socket Before=shutdown.target +Before=rescue.service [Service] Environment=HOME=/root diff --git a/units/machines.target b/units/machines.target index 99618a19f7..e07b0bb6ae 100644 --- a/units/machines.target +++ b/units/machines.target @@ -8,9 +8,6 @@ [Unit] Description=Containers Documentation=man:systemd.special(7) -Requires=basic.target -Conflicts=rescue.service rescue.target -After=basic.target rescue.service rescue.target Before=multi-user.target [Install] diff --git a/units/syslog.socket b/units/syslog.socket index d3987cb9a8..43981904ea 100644 --- a/units/syslog.socket +++ b/units/syslog.socket @@ -10,10 +10,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 diff --git a/units/system-update-cleanup.service.in b/units/system-update-cleanup.service.in index 116be8bc2d..dc524da7a3 100644 --- a/units/system-update-cleanup.service.in +++ b/units/system-update-cleanup.service.in @@ -11,6 +11,7 @@ Documentation=man:systemd.special(5) man:systemd.offline-updates(7) After=system-update.target DefaultDependencies=no Conflicts=shutdown.target +Before=shutdown.target # system-update-generator uses laccess("/system-update"), while a plain # ConditionPathExists=/system-update uses access("/system-update"), so diff --git a/units/system-update.target b/units/system-update.target index 3542879706..b95639a876 100644 --- a/units/system-update.target +++ b/units/system-update.target @@ -10,8 +10,6 @@ Description=Offline System Update Documentation=man:systemd.offline-updates(7) Documentation=man:systemd.special(7) man:systemd-system-update-generator(8) Requires=sysinit.target -Conflicts=shutdown.target After=sysinit.target -Before=shutdown.target AllowIsolate=yes Wants=system-update-cleanup.service diff --git a/units/systemd-networkd-wait-online.service.in b/units/systemd-networkd-wait-online.service.in index a84e91906d..89ca865b55 100644 --- a/units/systemd-networkd-wait-online.service.in +++ b/units/systemd-networkd-wait-online.service.in @@ -12,7 +12,7 @@ DefaultDependencies=no Conflicts=shutdown.target Requires=systemd-networkd.service After=systemd-networkd.service -Before=network-online.target +Before=network-online.target shutdown.target [Service] Type=oneshot diff --git a/units/systemd-volatile-root.service.in b/units/systemd-volatile-root.service.in index cc4e604e4c..c5a4ca3c27 100644 --- a/units/systemd-volatile-root.service.in +++ b/units/systemd-volatile-root.service.in @@ -12,7 +12,6 @@ DefaultDependencies=no Conflicts=shutdown.target After=sysroot.mount Before=initrd-root-fs.target shutdown.target -Conflicts=shutdown.target AssertPathExists=/etc/initrd-release [Service] |