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=6c4b870ec2531d094ea7d79ef2f860f96fd1fd29;hb=f057408c9c3b54b6eeb96cd9f0a1333f30610614;hpb=9f23530860942a8f94b7c535ead80c38f02424b1

diff --git a/units/emergency.service b/units/emergency.service
index 6c4b870ec..a5a54bc9d 100644
--- a/units/emergency.service
+++ b/units/emergency.service
@@ -1,29 +1,26 @@
 #  This file is part of systemd.
 #
-#  Copyright 2010 Lennart Poettering
-#
 #  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.
-#
-#  systemd is distributed in the hope that it will be useful, but
-#  WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-#  General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with systemd; If not, see <http://www.gnu.org/licenses/>.
 
 # See systemd.special(7) for details
 
 [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
-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)