X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=units%2Femergency.service;h=5910ec9b9108bedc5553dc9fe9397ece8d686c66;hb=980d87505c391682c7d9da2d48a1ba68f35c0339;hp=bcedebfa089d711f8df3201b3637381c847cfa7a;hpb=983d9c90151f4b85301bd8078afd560269e75961;p=elogind.git

diff --git a/units/emergency.service b/units/emergency.service
index bcedebfa0..5910ec9b9 100644
--- a/units/emergency.service
+++ b/units/emergency.service
@@ -10,16 +10,17 @@
 [Unit]
 Description=Emergency Shell
 DefaultDependencies=no
-Requires=shutdown.target umount.target
-After=shutdown.target umount.target
 
 [Service]
-ExecStart=/bin/sh
-StandardInput=tty
-Restart=restart-always
-RestartSec=0
+Environment=HOME=/root
+WorkingDirectory=/root
+ExecStartPre=-/bin/plymouth --hide-splash
+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
 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