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

diff --git a/units/emergency.service b/units/emergency.service
index a5a54bc9d23e4b4e452c8f8cec218b873ba50a55..dd4a0703e2637b72f69aa68ec7ef13b49402957a 100644 (file)
--- 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 63924eae9081464f338adb82abb51dc27b6db219..5bf2ae236bfaac0988f5a5b495c34173c9ab9bfb 100644 (file)
--- 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 4fe0d532f687fa08f97cdddf69e0e7a04e16b4ba..cf9ad49e7a319174acfdddf8b15d8c15c59b8cbe 100644 (file)
--- 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 3a5387570772fe8e0e9f7a7f22032baa60362023..e8b597c20088c76d97970b765670961f35ff1908 100644 (file)
--- 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 0f3e206eb0c3bcea1c4a8ef336353d2f25c2b53d..7a94db671e382b8675771b954189d6c4e6d2d409 100644 (file)
--- 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 27f3578c641d4b257caea839a5aa26cc9529d21b..be30efcaa9ca480b519eba1660827e663ad85582 100644 (file)
--- 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 21872e8d8af66840832b27386222456430883ab3..0c25bd2538ebddab0d0b442a91d586e2eb186f2a 100644 (file)
--- 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 323ba01a60e3300a98dc8160de7dcd2d0cf59817..2029297f2cbea688bd7946eb2f0d90e28cdd2cfc 100644 (file)
--- 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 638f47c1e8b19a45b8ad085239c3f242a8bf6cba..2694856c66e0e7e20a1dcd7aa9a2699b000c39a4 100644 (file)
--- 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]