X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=units%2Femergency.service;h=eafbf01c1fef6f56289df899c5680f765166db1a;hp=0014c263b400e37a4f4a5edd31baa80ca05c6abf;hb=739848d4f353288e4ed0abfcb894d581235c4c60;hpb=5682009b2153badf0c3d07baf574ef1b1547a5c5

diff --git a/units/emergency.service b/units/emergency.service
index 0014c263b..eafbf01c1 100644
--- a/units/emergency.service
+++ b/units/emergency.service
@@ -10,16 +10,17 @@
 [Unit]
 Description=Emergency Shell
 DefaultDependencies=no
-Wants=shutdown.target umount.target
-After=shutdown.target umount.target
 
 [Service]
-ExecStart=/bin/sh
-StandardInput=tty
+Environment=HOME=/root
+ExecStartPre=-/bin/plymouth --hide-splash
+ExecStartPre=-/bin/echo 'Welcome to emergency mode. Use "systemctl default" to activate default mode.'
+ExecStart=-/sbin/sulogin
+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