units: rely only on isolate to remove running services when entering rescue/emergency...

[elogind.git] / units / emergency.service

diff --git a/units/emergency.service b/units/emergency.service
index 83b7d72b7b7da7af76018ce27efe00500d50ac59..dd4a0703e2637b72f69aa68ec7ef13b49402957a 100644 (file)
--- a/units/emergency.service
+++ b/units/emergency.service
@@ -12,8 +12,14 @@ Description=Emergency Shell
 DefaultDependencies=no
 
 [Service]
 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
 ExecStart=/bin/sh

-StandardInput=tty
+StandardInput=tty-force

 Restart=restart-always
 RestartSec=0
 KillMode=process-group
 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)