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

diff --git a/units/emergency.service b/units/emergency.service
index 83b7d72b7..7a1f81a46 100644
--- a/units/emergency.service
+++ b/units/emergency.service
@@ -12,8 +12,14 @@ 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
-StandardInput=tty
+StandardInput=tty-force
 Restart=restart-always
 RestartSec=0
 KillMode=process-group
+
+# Bash ignores SIGTERM, so we send SIGHUP first, to ensure that bash
+# terminates cleanly.
+ExecStop=-/bin/kill -HUP ${MAINPID}