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=a97ec5e389b4000387030bd746ec0022f8de2ae2;hb=816115863962548a9a0d9fbfe429c7f8e685beac;hpb=cd25cce98f5cc930202212c3c9c13605c09698b4

diff --git a/units/emergency.service b/units/emergency.service
index a97ec5e38..43a74d7a3 100644
--- a/units/emergency.service
+++ b/units/emergency.service
@@ -17,11 +17,14 @@ Before=shutdown.target
 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.'
+ExecStartPre=-/bin/echo 'Welcome to emergency mode. Use "systemctl default" or ^D to enter default mode.'
 ExecStart=-/sbin/sulogin
-ExecStopPost=/bin/systemctl --fail default
+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.