Commit a974d58e authored by Lennart Poettering's avatar Lennart Poettering
Browse files

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

parent 0667db89
......@@ -10,7 +10,6 @@
[Unit]
Description=Emergency Shell
DefaultDependencies=no
After=shutdown.target
[Service]
ExecStartPre=-/bin/plymouth --hide-splash
......
......@@ -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
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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',
......
......@@ -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]
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment