X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=units%2Femergency.service;h=52f875c6f39d37d89ecc3ee2805f7b67c8d212cb;hp=eafbf01c1fef6f56289df899c5680f765166db1a;hb=de47ca9b50e8c05c9fc116ff37794e526bddf92e;hpb=739848d4f353288e4ed0abfcb894d581235c4c60

diff --git a/units/emergency.service b/units/emergency.service
index eafbf01c1..52f875c6f 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]
 Environment=HOME=/root
+Environment=TERM=vt100-nav
+WorkingDirectory=/root
 ExecStartPre=-/bin/plymouth --hide-splash
-ExecStartPre=-/bin/echo 'Welcome to emergency mode. Use "systemctl default" to activate default mode.'
+ExecStartPre=-/bin/echo 'Welcome to emergency mode. Use "systemctl default" or ^D to activate default mode.'
 ExecStart=-/sbin/sulogin
+ExecStopPost=/bin/systemctl default
 StandardInput=tty-force
-Restart=restart-always
-RestartSec=0
 KillMode=process-group
 
 # Bash ignores SIGTERM, so we send SIGHUP instead, to ensure that bash