picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
Lennart Poettering 2010-07-13 00:19:17 +02:00
parent 0667db89fb
commit a974d58e83
9 changed files with 12 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
units/emergency.service
View file

@ -10,7 +10,6 @@
[Unit] [Unit]
Description=Emergency Shell Description=Emergency Shell
DefaultDependencies=no DefaultDependencies=no
After=shutdown.target
[Service] [Service]
ExecStartPre=-/bin/plymouth --hide-splash ExecStartPre=-/bin/plymouth --hide-splash

4
units/emergency.target
View file

@ -9,5 +9,5 @@
[Unit] [Unit]
Description=Emergency Mode Description=Emergency Mode
Requires=shutdown.target umount.target emergency.service Requires=emergency.service
After=shutdown.target umount.target emergency.service After=emergency.service

3
units/fedora/halt.service
View file

@ -9,8 +9,7 @@
Description=Halt Description=Halt
DefaultDependencies=no DefaultDependencies=no
Requires=shutdown.target umount.target killall.service Requires=shutdown.target umount.target killall.service
Conflicts=sysinit.service After=shutdown.target umount.target killall.service
After=shutdown.target umount.target killall.service sysinit.service
[Service] [Service]
Type=finish Type=finish

3
units/fedora/poweroff.service
View file

@ -9,8 +9,7 @@
Description=Power-Off Description=Power-Off
DefaultDependencies=no DefaultDependencies=no
Requires=shutdown.target umount.target killall.service Requires=shutdown.target umount.target killall.service
Conflicts=sysinit.service After=shutdown.target umount.target killall.service
After=shutdown.target umount.target killall.service sysinit.service
[Service] [Service]
Type=finish Type=finish

3
units/fedora/reboot.service
View file

@ -9,8 +9,7 @@
Description=Reboot Description=Reboot
DefaultDependencies=no DefaultDependencies=no
Requires=shutdown.target umount.target killall.service Requires=shutdown.target umount.target killall.service
Conflicts=sysinit.service After=shutdown.target umount.target killall.service
After=shutdown.target umount.target killall.service sysinit.service
[Service] [Service]
Type=finish Type=finish

3
units/fedora/single.service
View file

@ -10,7 +10,8 @@
[Unit] [Unit]
Description=Rescue Shell Description=Rescue Shell
DefaultDependencies=no DefaultDependencies=no
After=shutdown.target sysinit.target Conflicts=multi-user.target
After=sysinit.target multi-user.target
[Service] [Service]
ExecStartPre=-/bin/plymouth --hide-splash ExecStartPre=-/bin/plymouth --hide-splash

3
units/fedora/sysinit.service
View file

@ -8,7 +8,8 @@
[Unit] [Unit]
Description=System Initialization Description=System Initialization
DefaultDependencies=no DefaultDependencies=no
Before=emergency.service emergency.target Conflicts=shutdown.target
Before=shutdown.target emergency.service emergency.target
[Service] [Service]
ExecStart=/etc/rc.d/rc.sysinit ExecStart=/etc/rc.d/rc.sysinit

2
units/multi-user.target.m4
View file

@ -10,7 +10,7 @@
[Unit] [Unit]
Description=Multi-User Description=Multi-User
Requires=basic.target Requires=basic.target
Conflicts=rescue.target shutdown.target Conflicts=rescue.target
After=basic.target rescue.target After=basic.target rescue.target
m4_dnl m4_dnl
m4_ifdef(`TARGET_FEDORA', m4_ifdef(`TARGET_FEDORA',

5
units/rescue.target
View file

@ -9,9 +9,8 @@
[Unit] [Unit]
Description=Rescue Mode Description=Rescue Mode
Requires=sysinit.target local-fs.target swap.target shutdown.target Requires=sysinit.target local-fs.target swap.target
Conflicts=emergency.service emergency.target After=sysinit.target local-fs.target swap.target
After=sysinit.target local-fs.target swap.target shutdown.target emergency.service emergency.target
Names=runlevel1.target Names=runlevel1.target
[Install] [Install]