X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=units%2Femergency.service;h=4847f4f0c6ef243c878fa6e635cb8976911becf3;hp=e05678255b3f57c008c848d2e64ddcd48f5de2e1;hb=822b18599d1c9465449c7111fe7e7b86fbf44a57;hpb=5f36328f55dfc7942b7db74271206d0c60c48799

diff --git a/units/emergency.service b/units/emergency.service
index e05678255..4847f4f0c 100644
--- a/units/emergency.service
+++ b/units/emergency.service
@@ -10,17 +10,20 @@
 [Unit]
 Description=Emergency Shell
 DefaultDependencies=no
+Conflicts=shutdown.target
+Before=shutdown.target
 
 [Service]
 Environment=HOME=/root
-Environment=TERM=vt100-nav
 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.