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=aa3d9856c03a3d5596d7f701e56dce452dd66465;hb=816115863962548a9a0d9fbfe429c7f8e685beac;hpb=e3aa71c38cbecb24e6333411ee19814796a5b1d0

diff --git a/units/emergency.service b/units/emergency.service
index aa3d9856c..43a74d7a3 100644
--- a/units/emergency.service
+++ b/units/emergency.service
@@ -16,12 +16,15 @@ Before=shutdown.target
 [Service]
 Environment=HOME=/root
 WorkingDirectory=/root
-ExecStartPre=-/bin/plymouth --hide-splash
-ExecStartPre=-/bin/echo 'Welcome to emergency mode. Use "systemctl default" or ^D to activate default mode.'
+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 default
+ExecStopPost=/bin/systemctl --fail --no-block default
 StandardInput=tty-force
-KillMode=process-group
+StandardOutput=inherit
+StandardError=inherit
+KillMode=process
+IgnoreSIGPIPE=no
 
 # Bash ignores SIGTERM, so we send SIGHUP instead, to ensure that bash
 # terminates cleanly.