X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=units%2Femergency.service;h=cb28a783852a172bbe592a8ed7175b5c7fe669ed;hb=fe783b03419181bed69003ffdd73132426de246a;hp=0014c263b400e37a4f4a5edd31baa80ca05c6abf;hpb=5682009b2153badf0c3d07baf574ef1b1547a5c5;p=elogind.git

diff --git a/units/emergency.service b/units/emergency.service
index 0014c263b..cb28a7838 100644
--- a/units/emergency.service
+++ b/units/emergency.service
@@ -10,16 +10,19 @@
 [Unit]
 Description=Emergency Shell
 DefaultDependencies=no
-Wants=shutdown.target umount.target
-After=shutdown.target umount.target
+Conflicts=shutdown.target
+Before=shutdown.target
 
 [Service]
-ExecStart=/bin/sh
-StandardInput=tty
-Restart=restart-always
-RestartSec=0
+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 default
+StandardInput=tty-force
 KillMode=process-group
 
-# Bash ignores SIGTERM, so we send SIGHUP first, to ensure that bash
+# Bash ignores SIGTERM, so we send SIGHUP instead, to ensure that bash
 # terminates cleanly.
-ExecStop=/bin/kill -HUP $(MAINPID)
+KillSignal=SIGHUP