X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=units%2Femergency.service;h=43a74d7a3685f3554fa6d0f45b4a9cc98799a1e7;hb=3e2147858f21943d5f4a781c60f33ac22c6096ed;hp=8e378482c1ba41f977eaaedd99c4c2950fa2e7ba;hpb=1fd116f7484fe85c30c6619154c2506a52da80ed;p=elogind.git

diff --git a/units/emergency.service b/units/emergency.service
index 8e378482c..43a74d7a3 100644
--- a/units/emergency.service
+++ b/units/emergency.service
@@ -10,17 +10,21 @@
 [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/echo 'Welcome to emergency mode. Use "systemctl default" 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 --fail --no-block default
 StandardInput=tty-force
-Restart=restart-always
-RestartSec=0
-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.