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

diff --git a/units/emergency.service b/units/emergency.service
index 7a1f81a46..4847f4f0c 100644
--- a/units/emergency.service
+++ b/units/emergency.service
@@ -10,16 +10,21 @@
 [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
+StandardOutput=inherit
+StandardError=inherit
+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