X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=units%2Femergency.service;h=dd4a0703e2637b72f69aa68ec7ef13b49402957a;hp=3cbca3d01267a550bea21d6c2f8f8aad10ea5f8b;hb=6f28c033ec506847b3bfa4efaf52478120c36946;hpb=dfca381db341205b7a68f40ef2b7550ac6972cab

diff --git a/units/emergency.service b/units/emergency.service
index 3cbca3d01..dd4a0703e 100644
--- a/units/emergency.service
+++ b/units/emergency.service
@@ -9,11 +9,17 @@
 
 [Unit]
 Description=Emergency Shell
+DefaultDependencies=no
 
 [Service]
+ExecStartPre=-/bin/plymouth --hide-splash
+ExecStartPre=-/bin/echo 'Welcome to emergency mode. Use "systemctl default" to activate default mode.'
 ExecStart=/bin/sh
-Type=simple
-StandardInput=tty
+StandardInput=tty-force
 Restart=restart-always
 RestartSec=0
-KillMode=process
+KillMode=process-group
+
+# Bash ignores SIGTERM, so we send SIGHUP first, to ensure that bash
+# terminates cleanly.
+ExecStop=-/bin/kill -HUP $(MAINPID)