From a974d58e83e409a92ca916bb9bbce0e457ea896f Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 13 Jul 2010 00:19:17 +0200 Subject: units: rely only on isolate to remove running services when entering rescue/emergency modes --- units/fedora/halt.service | 3 +-- units/fedora/poweroff.service | 3 +-- units/fedora/reboot.service | 3 +-- units/fedora/single.service | 3 ++- units/fedora/sysinit.service | 3 ++- 5 files changed, 7 insertions(+), 8 deletions(-) (limited to 'units/fedora') 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 -- cgit v1.2.3-54-g00ecf