X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=units%2Femergency.service;h=e05678255b3f57c008c848d2e64ddcd48f5de2e1;hp=7a1f81a468bb77eb602a33d1e4dc5978b2febd9d;hb=15412f2987c0f0a562f9cf8edcca023f90a5f5bd;hpb=c24eb49e6aecd6de2ad450083e826d4c9d9c75b6

diff --git a/units/emergency.service b/units/emergency.service
index 7a1f81a46..e05678255 100644
--- a/units/emergency.service
+++ b/units/emergency.service
@@ -12,14 +12,16 @@ Description=Emergency Shell
 DefaultDependencies=no
 
 [Service]
+Environment=HOME=/root
+Environment=TERM=vt100-nav
+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