X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=units%2Femergency.service;h=43a74d7a3685f3554fa6d0f45b4a9cc98799a1e7;hp=3cbca3d01267a550bea21d6c2f8f8aad10ea5f8b;hb=816115863962548a9a0d9fbfe429c7f8e685beac;hpb=dfca381db341205b7a68f40ef2b7550ac6972cab

diff --git a/units/emergency.service b/units/emergency.service
index 3cbca3d01..43a74d7a3 100644
--- a/units/emergency.service
+++ b/units/emergency.service
@@ -9,11 +9,23 @@
 
 [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 enter default mode.'
+ExecStart=-/sbin/sulogin
+ExecStopPost=/bin/systemctl --fail --no-block default
+StandardInput=tty-force
+StandardOutput=inherit
+StandardError=inherit
 KillMode=process
+IgnoreSIGPIPE=no
+
+# Bash ignores SIGTERM, so we send SIGHUP instead, to ensure that bash
+# terminates cleanly.
+KillSignal=SIGHUP