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

diff --git a/units/emergency.service b/units/emergency.service
index 2e9d049f2..eff526186 100644
--- a/units/emergency.service
+++ b/units/emergency.service
@@ -1,10 +1,28 @@
-[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
+Conflicts=shutdown.target
+Before=shutdown.target
 
 [Service]
-ExecStart=/bin/sh
-Type=simple
-StandardInput=tty
-Restart=restart-always
-RestartSec=0
+Environment=HOME=/root
+WorkingDirectory=/root
+ExecStartPre=-/bin/plymouth quit
+ExecStartPre=-/bin/echo 'Welcome to emergency mode. Use "systemctl default" or ^D to activate default mode.'
+ExecStart=-/sbin/sulogin
+ExecStopPost=/bin/systemctl --fail --no-block default
+StandardInput=tty-force
 KillMode=process
+
+# Bash ignores SIGTERM, so we send SIGHUP instead, to ensure that bash
+# terminates cleanly.
+KillSignal=SIGHUP