units: rely only on isolate to remove running services when entering rescue/emergency modes

9 files changed, 12 insertions, 15 deletions

diff --git a/units/emergency.service b/units/emergency.service
index a5a54bc9d..dd4a0703e 100644
--- a/units/emergency.service
+++ b/units/emergency.service
@@ -10,7 +10,6 @@
 [Unit]
 Description=Emergency Shell
 DefaultDependencies=no
-After=shutdown.target
 
 [Service]
 ExecStartPre=-/bin/plymouth --hide-splash
diff --git a/units/emergency.target b/units/emergency.target
index 63924eae9..5bf2ae236 100644
--- a/units/emergency.target
+++ b/units/emergency.target
@@ -9,5 +9,5 @@
 
 [Unit]
 Description=Emergency Mode
-Requires=shutdown.target umount.target emergency.service
-After=shutdown.target umount.target emergency.service
+Requires=emergency.service
+After=emergency.service
diff --git a/units/fedora/halt.service b/units/fedora/halt.service
index 4fe0d532f..cf9ad49e7 100644
--- a/units/fedora/halt.service
+++ b/units/fedora/halt.service
@@ -9,8 +9,7 @@
 Description=Halt
 DefaultDependencies=no
 Requires=shutdown.target umount.target killall.service
-Conflicts=sysinit.service
-After=shutdown.target umount.target killall.service sysinit.service
+After=shutdown.target umount.target killall.service
 
 [Service]
 Type=finish
diff --git a/units/fedora/poweroff.service b/units/fedora/poweroff.service
index 3a5387570..e8b597c20 100644
--- a/units/fedora/poweroff.service
+++ b/units/fedora/poweroff.service
@@ -9,8 +9,7 @@
 Description=Power-Off
 DefaultDependencies=no
 Requires=shutdown.target umount.target killall.service
-Conflicts=sysinit.service
-After=shutdown.target umount.target killall.service sysinit.service
+After=shutdown.target umount.target killall.service
 
 [Service]
 Type=finish
diff --git a/units/fedora/reboot.service b/units/fedora/reboot.service
index 0f3e206eb..7a94db671 100644
--- a/units/fedora/reboot.service
+++ b/units/fedora/reboot.service
@@ -9,8 +9,7 @@
 Description=Reboot
 DefaultDependencies=no
 Requires=shutdown.target umount.target killall.service
-Conflicts=sysinit.service
-After=shutdown.target umount.target killall.service sysinit.service
+After=shutdown.target umount.target killall.service
 
 [Service]
 Type=finish
diff --git a/units/fedora/single.service b/units/fedora/single.service
index 27f3578c6..be30efcaa 100644
--- a/units/fedora/single.service
+++ b/units/fedora/single.service
@@ -10,7 +10,8 @@
 [Unit]
 Description=Rescue Shell
 DefaultDependencies=no
-After=shutdown.target sysinit.target
+Conflicts=multi-user.target
+After=sysinit.target multi-user.target
 
 [Service]
 ExecStartPre=-/bin/plymouth --hide-splash
diff --git a/units/fedora/sysinit.service b/units/fedora/sysinit.service
index 21872e8d8..0c25bd253 100644
--- a/units/fedora/sysinit.service
+++ b/units/fedora/sysinit.service
@@ -8,7 +8,8 @@
 [Unit]
 Description=System Initialization
 DefaultDependencies=no
-Before=emergency.service emergency.target
+Conflicts=shutdown.target
+Before=shutdown.target emergency.service emergency.target
 
 [Service]
 ExecStart=/etc/rc.d/rc.sysinit
diff --git a/units/multi-user.target.m4 b/units/multi-user.target.m4
index 323ba01a6..2029297f2 100644
--- a/units/multi-user.target.m4
+++ b/units/multi-user.target.m4
@@ -10,7 +10,7 @@
 [Unit]
 Description=Multi-User
 Requires=basic.target
-Conflicts=rescue.target shutdown.target
+Conflicts=rescue.target
 After=basic.target rescue.target
 m4_dnl
 m4_ifdef(`TARGET_FEDORA',
diff --git a/units/rescue.target b/units/rescue.target
index 638f47c1e..2694856c6 100644
--- a/units/rescue.target
+++ b/units/rescue.target
@@ -9,9 +9,8 @@
 
 [Unit]
 Description=Rescue Mode
-Requires=sysinit.target local-fs.target swap.target shutdown.target
-Conflicts=emergency.service emergency.target
-After=sysinit.target local-fs.target swap.target shutdown.target emergency.service emergency.target
+Requires=sysinit.target local-fs.target swap.target
+After=sysinit.target local-fs.target swap.target
 Names=runlevel1.target
 
 [Install]