summaryrefslogtreecommitdiff
path: root/units
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2010-07-13 00:19:17 +0200
committerLennart Poettering <lennart@poettering.net>2010-07-13 00:19:17 +0200
commita974d58e83e409a92ca916bb9bbce0e457ea896f (patch)
treec6da1a6681ce728a424a20fd716081755c094398 /units
parent0667db89fbfb24b4079fb67d0209014592892485 (diff)
units: rely only on isolate to remove running services when entering rescue/emergency modes
Diffstat (limited to 'units')
-rw-r--r--units/emergency.service1
-rw-r--r--units/emergency.target4
-rw-r--r--units/fedora/halt.service3
-rw-r--r--units/fedora/poweroff.service3
-rw-r--r--units/fedora/reboot.service3
-rw-r--r--units/fedora/single.service3
-rw-r--r--units/fedora/sysinit.service3
-rw-r--r--units/multi-user.target.m42
-rw-r--r--units/rescue.target5
9 files changed, 12 insertions, 15 deletions
diff --git a/units/emergency.service b/units/emergency.service
index a5a54bc9d2..dd4a0703e2 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 63924eae90..5bf2ae236b 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 4fe0d532f6..cf9ad49e7a 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 3a53875707..e8b597c200 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 0f3e206eb0..7a94db671e 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 27f3578c64..be30efcaa9 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 21872e8d8a..0c25bd2538 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 323ba01a60..2029297f2c 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 638f47c1e8..2694856c66 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]