diff options
| author | Alan Jenkins <alan.christopher.jenkins@gmail.com> | 2017-09-25 12:10:38 +0100 |
|---|---|---|
| committer | Alan Jenkins <alan.christopher.jenkins@gmail.com> | 2017-09-30 22:01:42 +0100 |
| commit | 0b9ad5bf2ec09e963f706fdba498d99f29f97a54 (patch) | |
| tree | 27e8adeee4f64be75d7bab66057148ae37dc6d7f | |
| parent | 6f6d1a8a6abae490e14e6a448895e36c6cefdefc (diff) | |
| download | systemd-0b9ad5bf2ec09e963f706fdba498d99f29f97a54.tar.gz | |
units: add missing Before=shutdown.target for units which it Conflicts
There's a few services missing this ordering.
Also remove a duplicate Conflicts=shutdown.target from
systemd-volatile-root.service.
| -rw-r--r-- | units/system-update-cleanup.service.in | 1 | ||||
| -rw-r--r-- | units/systemd-networkd-wait-online.service.in | 2 | ||||
| -rw-r--r-- | units/systemd-volatile-root.service.in | 1 |
3 files changed, 2 insertions, 2 deletions
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/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] |