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

diff --git a/units/emergency.service b/units/emergency.service
index 2e9d049f2..7a1f81a46 100644
--- a/units/emergency.service
+++ b/units/emergency.service
@@ -1,10 +1,25 @@
-[Meta]
+#  This file is part of systemd.
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2 of the License, or
+#  (at your option) any later version.
+
+# See systemd.special(7) for details
+
+[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}