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.

diff --git a/units/system-update-cleanup.service.in b/units/system-update-cleanup.service.in
index 116be8bc2d4c9015ad15b27723fd953cb4ffd57a..dc524da7a365f7c0837e6f5f2f923ac649d9bce9 100644 (file)
--- 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 a84e91906d96a9e4d2a01609b81130846bfaa8d0..89ca865b55ae89188454e1fc2f2106521903e3b1 100644 (file)
--- 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 cc4e604e4c30123d31d264ad7717667022ffac7d..c5a4ca3c27803f2dedfe3a5da2a32c75d58c8524 100644 (file)
--- 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]