units: add --no-block when starting normal service after shell exited

[elogind.git] / units / emergency.service

diff --git a/units/emergency.service b/units/emergency.service
index dd4a0703e2637b72f69aa68ec7ef13b49402957a..eff5261868566a08cc9af23260882dca2f42718f 100644 (file)
--- a/units/emergency.service
+++ b/units/emergency.service
@@ -10,16 +10,19 @@
 [Unit]
 Description=Emergency Shell
 DefaultDependencies=no
+Conflicts=shutdown.target
+Before=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
+Environment=HOME=/root
+WorkingDirectory=/root
+ExecStartPre=-/bin/plymouth quit
+ExecStartPre=-/bin/echo 'Welcome to emergency mode. Use "systemctl default" or ^D to activate default mode.'
+ExecStart=-/sbin/sulogin
+ExecStopPost=/bin/systemctl --fail --no-block default
 StandardInput=tty-force
-Restart=restart-always
-RestartSec=0
-KillMode=process-group
+KillMode=process
 
-# Bash ignores SIGTERM, so we send SIGHUP first, to ensure that bash
+# Bash ignores SIGTERM, so we send SIGHUP instead, to ensure that bash
 # terminates cleanly.
-ExecStop=-/bin/kill -HUP $(MAINPID)
+KillSignal=SIGHUP