X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=units%2Femergency.service;h=eff5261868566a08cc9af23260882dca2f42718f;hp=8578654d88611b6e68da3393c58919dd39c5a80a;hb=de6c78f8795743894431a099d26ec562a8acf3df;hpb=525ee6f4a1639bcb28198bf9e32b93ca2bfd268b

diff --git a/units/emergency.service b/units/emergency.service
index 8578654d8..eff526186 100644
--- a/units/emergency.service
+++ b/units/emergency.service
@@ -10,17 +10,18 @@
 [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 activate default mode.'
 ExecStart=-/sbin/sulogin
+ExecStopPost=/bin/systemctl --fail --no-block default
 StandardInput=tty-force
-Restart=always
-RestartSec=0
-KillMode=process-group
+KillMode=process
 
 # Bash ignores SIGTERM, so we send SIGHUP instead, to ensure that bash
 # terminates cleanly.