X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=units%2Femergency.service;h=aa3d9856c03a3d5596d7f701e56dce452dd66465;hp=924723fefede74b2fe1a98653aa5cf781b4477d7;hb=e3aa71c38cbecb24e6333411ee19814796a5b1d0;hpb=1f48cf56cb2693b84fdc76dc8df0b048ed50ef43

diff --git a/units/emergency.service b/units/emergency.service
index 924723fef..aa3d9856c 100644
--- a/units/emergency.service
+++ b/units/emergency.service
@@ -9,10 +9,20 @@
 
 [Unit]
 Description=Emergency Shell
+DefaultDependencies=no
+Conflicts=shutdown.target
+Before=shutdown.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 instead, to ensure that bash
+# terminates cleanly.
+KillSignal=SIGHUP