diff options
Diffstat (limited to 'units')
| -rw-r--r-- | units/emergency.service | 9 | ||||
| -rw-r--r-- | units/fedora/halt.service | 6 | ||||
| -rw-r--r-- | units/fedora/poweroff.service | 6 | ||||
| -rw-r--r-- | units/fedora/reboot.service | 6 | ||||
| -rw-r--r-- | units/fedora/sysinit.service | 4 | ||||
| -rw-r--r-- | units/multi-user.target.m4 | 4 | ||||
| -rw-r--r-- | units/rescue.target | 7 | ||||
| -rw-r--r-- | units/sysinit.target.m4 | 3 |
8 files changed, 23 insertions, 22 deletions
diff --git a/units/emergency.service b/units/emergency.service index bcedebfa08..a5a54bc9d2 100644 --- a/units/emergency.service +++ b/units/emergency.service @@ -10,16 +10,17 @@ [Unit] Description=Emergency Shell DefaultDependencies=no -Requires=shutdown.target umount.target -After=shutdown.target umount.target +After=shutdown.target [Service] +ExecStartPre=-/bin/plymouth --hide-splash +ExecStartPre=-/bin/echo 'Welcome to emergency mode. Use "systemctl default" to activate default mode.' ExecStart=/bin/sh -StandardInput=tty +StandardInput=tty-force Restart=restart-always RestartSec=0 KillMode=process-group # Bash ignores SIGTERM, so we send SIGHUP first, to ensure that bash # terminates cleanly. -ExecStop=/bin/kill -HUP $(MAINPID) +ExecStop=-/bin/kill -HUP $(MAINPID) diff --git a/units/fedora/halt.service b/units/fedora/halt.service index b957a3fe30..4fe0d532f6 100644 --- a/units/fedora/halt.service +++ b/units/fedora/halt.service @@ -8,9 +8,9 @@ [Unit] Description=Halt DefaultDependencies=no -Requires=shutdown.target killall.service -After=shutdown.target killall.service -Conflicts=dev-hugepages.automount dev-mqueue.automount proc-sys-fs-binfmt_misc.automount sys-kernel-debug.automount sys-kernel-security.automount +Requires=shutdown.target umount.target killall.service +Conflicts=sysinit.service +After=shutdown.target umount.target killall.service sysinit.service [Service] Type=finish diff --git a/units/fedora/poweroff.service b/units/fedora/poweroff.service index 76d030c041..3a53875707 100644 --- a/units/fedora/poweroff.service +++ b/units/fedora/poweroff.service @@ -8,9 +8,9 @@ [Unit] Description=Power-Off DefaultDependencies=no -Requires=shutdown.target killall.service -After=shutdown.target killall.service -Conflicts=dev-hugepages.automount dev-mqueue.automount proc-sys-fs-binfmt_misc.automount sys-kernel-debug.automount sys-kernel-security.automount +Requires=shutdown.target umount.target killall.service +Conflicts=sysinit.service +After=shutdown.target umount.target killall.service sysinit.service [Service] Type=finish diff --git a/units/fedora/reboot.service b/units/fedora/reboot.service index 6a93c0b557..0f3e206eb0 100644 --- a/units/fedora/reboot.service +++ b/units/fedora/reboot.service @@ -8,9 +8,9 @@ [Unit] Description=Reboot DefaultDependencies=no -Requires=shutdown.target killall.service -After=shutdown.target killall.service -Conflicts=dev-hugepages.automount dev-mqueue.automount proc-sys-fs-binfmt_misc.automount sys-kernel-debug.automount sys-kernel-security.automount +Requires=shutdown.target umount.target killall.service +Conflicts=sysinit.service +After=shutdown.target umount.target killall.service sysinit.service [Service] Type=finish diff --git a/units/fedora/sysinit.service b/units/fedora/sysinit.service index 884de8d1d6..21872e8d8a 100644 --- a/units/fedora/sysinit.service +++ b/units/fedora/sysinit.service @@ -8,9 +8,7 @@ [Unit] Description=System Initialization DefaultDependencies=no -Before=local-fs.target remote-fs.target swap.target sockets.target -Conflicts=shutdown.target -Before=shutdown.target +Before=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 010e7d8474..323ba01a60 100644 --- a/units/multi-user.target.m4 +++ b/units/multi-user.target.m4 @@ -10,8 +10,8 @@ [Unit] Description=Multi-User Requires=basic.target -After=basic.target -Conflicts=rescue.target +Conflicts=rescue.target shutdown.target +After=basic.target rescue.target m4_dnl m4_ifdef(`TARGET_FEDORA', m4_dnl On Fedora Runlevel 3 is multi-user diff --git a/units/rescue.target b/units/rescue.target index 0398f9bfb4..638f47c1e8 100644 --- a/units/rescue.target +++ b/units/rescue.target @@ -8,9 +8,10 @@ # See systemd.special(7) for details [Unit] -Description=Rescue Prompt -Requires=basic.target -After=basic.target +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 Names=runlevel1.target [Install] diff --git a/units/sysinit.target.m4 b/units/sysinit.target.m4 index 48e55a4358..29693b3ff2 100644 --- a/units/sysinit.target.m4 +++ b/units/sysinit.target.m4 @@ -9,7 +9,8 @@ [Unit] Description=Systemd Initialization -Conflicts=emergency.service +Conflicts=emergency.service emergency.target +After=emergency.service emergency.target OnlyByDependency=yes m4_dnl m4_ifdef(`TARGET_FEDORA', |