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=4a1e31ac7f002398acabc5cb9d518cf85af487e2;hb=7948c4dfbea73ac21250b588089039aa17a90386;hpb=ddad68097d307fd8cdfd06946691211fb65b74e3

diff --git a/units/emergency.service b/units/emergency.service
index 4a1e31ac7..eff526186 100644
--- a/units/emergency.service
+++ b/units/emergency.service
@@ -10,15 +10,18 @@
 [Unit]
 Description=Emergency Shell
 DefaultDependencies=no
+Conflicts=shutdown.target
+Before=shutdown.target
 
 [Service]
-ExecStartPre=-/bin/plymouth --hide-splash
-ExecStartPre=-/bin/echo 'Welcome to emergency mode. Use "systemctl default" to activate default mode.'
+Environment=HOME=/root
+WorkingDirectory=/root
+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=restart-always
-RestartSec=0
-KillMode=process-group
+KillMode=process
 
 # Bash ignores SIGTERM, so we send SIGHUP instead, to ensure that bash
 # terminates cleanly.