units: always send HUP when dealing with shells/gettys/logins

[elogind.git] / units / emergency.service

diff --git a/units/emergency.service b/units/emergency.service
index 0014c263b400e37a4f4a5edd31baa80ca05c6abf..dda7e168cb65ec447766b0e1a90bf549c00ddab3 100644 (file)
--- a/units/emergency.service
+++ b/units/emergency.service
@@ -10,16 +10,16 @@
 [Unit]
 Description=Emergency Shell
 DefaultDependencies=no
-Wants=shutdown.target umount.target
-After=shutdown.target umount.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
+# Bash ignores SIGTERM, so we send SIGHUP instead, to ensure that bash
 # terminates cleanly.
-ExecStop=/bin/kill -HUP $(MAINPID)
+KillSignal=SIGHUP