X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=units%2Femergency.service;h=eff5261868566a08cc9af23260882dca2f42718f;hb=8e4fb44ab0f853ff8faedcaa2cbc58b80eda9611;hp=8745d101c7f78827fc5cbabbb1552d5a55937426;hpb=319346674c5665af895e854e1754eed4b5e36f42;p=elogind.git

diff --git a/units/emergency.service b/units/emergency.service
index 8745d101c..eff526186 100644
--- a/units/emergency.service
+++ b/units/emergency.service
@@ -10,14 +10,19 @@
 [Unit]
 Description=Emergency Shell
 DefaultDependencies=no
+Conflicts=shutdown.target
+Before=shutdown.target
 
 [Service]
-ExecStart=/bin/sh
-StandardInput=tty
-Restart=restart-always
-RestartSec=0
-KillMode=process-group
+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
+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