X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=units%2Femergency.service;h=4847f4f0c6ef243c878fa6e635cb8976911becf3;hb=81beb7508e72b29ae7cec60b50231cbe0c1d582e;hp=5910ec9b9108bedc5553dc9fe9397ece8d686c66;hpb=273f54cdc2ce9eec741157c60fa240a23d79bb72;p=elogind.git

diff --git a/units/emergency.service b/units/emergency.service
index 5910ec9b9..4847f4f0c 100644
--- a/units/emergency.service
+++ b/units/emergency.service
@@ -10,16 +10,20 @@
 [Unit]
 Description=Emergency Shell
 DefaultDependencies=no
+Conflicts=shutdown.target
+Before=shutdown.target
 
 [Service]
 Environment=HOME=/root
 WorkingDirectory=/root
-ExecStartPre=-/bin/plymouth --hide-splash
+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 default
+ExecStopPost=/bin/systemctl --fail --no-block default
 StandardInput=tty-force
-KillMode=process-group
+StandardOutput=inherit
+StandardError=inherit
+KillMode=process
 
 # Bash ignores SIGTERM, so we send SIGHUP instead, to ensure that bash
 # terminates cleanly.