units: synchronize with shutdown.target

diff --git a/units/fedora/killall.service b/units/fedora/killall.service
index 13bb564ad5d6b3da1e2a227ba5d9d94cc555a855..09781075bfdec2f7a0214932e39002878011996e 100644 (file)
--- a/units/fedora/killall.service
+++ b/units/fedora/killall.service
@@ -17,6 +17,7 @@
 
 [Unit]
 Description=Kill All Processes
+After=shutdown.target
 
 [Service]
 Type=finish

diff --git a/units/fedora/prefdm.service b/units/fedora/prefdm.service
index 7df09ac84d09e8e1f760d48acc82fbf97a57528b..227ffbaad8e0e6da86f69aa21a57e8b1ce86d441 100644 (file)
--- a/units/fedora/prefdm.service
+++ b/units/fedora/prefdm.service
@@ -19,6 +19,7 @@
 Description=Display Manager
 Before=graphical.target
 After=basic.target syslog.target messagebus.service haldaemon.service
+Conflicts=shutdown.target
 
 [Service]
 ExecStart=/etc/X11/prefdm -nodaemon

diff --git a/units/fedora/rc-local.service b/units/fedora/rc-local.service
index e8284a183af4bd2081fed57b01cdaccfd83688d0..30a2c8afbdc86752cc738170d3375ba34f983ce4 100644 (file)
--- a/units/fedora/rc-local.service
+++ b/units/fedora/rc-local.service
@@ -18,6 +18,7 @@
 [Unit]
 Description=/etc/rc.local Compatibility
 Requires=basic.target
+Conflicts=shutdown.target
 
 # The rcN.d symlink uses the name "local" while the script itself is
 # called "rc.local", hence carry both names here.

diff --git a/units/getty@.service.m4 b/units/getty@.service.m4
index ffcc42aad95ef087012a5d7fddf568f686f8d28d..890b4897a34c7ff86c46757366719db33c4862c2 100644 (file)
--- a/units/getty@.service.m4
+++ b/units/getty@.service.m4
@@ -23,6 +23,7 @@ m4_dnl
 Description=Getty on %I
 Before=getty.target
 After=basic.target
+Conflicts=shutdown.target
 
 [Service]
 Type=simple