X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=units%2Femergency.service;h=5910ec9b9108bedc5553dc9fe9397ece8d686c66;hb=306a7fd82e790b3c00ba5cf806ccd6c0108061b5;hp=dd4a0703e2637b72f69aa68ec7ef13b49402957a;hpb=a974d58e83e409a92ca916bb9bbce0e457ea896f;p=elogind.git

diff --git a/units/emergency.service b/units/emergency.service
index dd4a0703e..5910ec9b9 100644
--- a/units/emergency.service
+++ b/units/emergency.service
@@ -12,14 +12,15 @@ Description=Emergency Shell
 DefaultDependencies=no
 
 [Service]
+Environment=HOME=/root
+WorkingDirectory=/root
 ExecStartPre=-/bin/plymouth --hide-splash
-ExecStartPre=-/bin/echo 'Welcome to emergency mode. Use "systemctl default" to activate default mode.'
-ExecStart=/bin/sh
+ExecStartPre=-/bin/echo 'Welcome to emergency mode. Use "systemctl default" or ^D to activate default mode.'
+ExecStart=-/sbin/sulogin
+ExecStopPost=/bin/systemctl default
 StandardInput=tty-force
-Restart=restart-always
-RestartSec=0
 KillMode=process-group
 
-# 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