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

diff --git a/units/emergency.service b/units/emergency.service
index 83b7d72b7..a5a54bc9d 100644
--- a/units/emergency.service
+++ b/units/emergency.service
@@ -10,10 +10,17 @@
 [Unit]
 Description=Emergency Shell
 DefaultDependencies=no
+After=shutdown.target
 
 [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)