units: rework systemd-nspawn@.service unit

[elogind.git] / units / emergency.service.in

diff --git a/units/emergency.service.in b/units/emergency.service.in
index 91fc1bbf51fd4a3baba0eaa0931e554edf0ab38e..18973e78fa8cbbe9980eaea21895ad6aba82c4cc 100644 (file)
--- a/units/emergency.service.in
+++ b/units/emergency.service.in
@@ -10,13 +10,14 @@ Description=Emergency Shell
 Documentation=man:sulogin(8)
 DefaultDependencies=no
 Conflicts=shutdown.target
+Conflicts=rescue.service
 Before=shutdown.target
 
 [Service]
 Environment=HOME=/root
 WorkingDirectory=/root
 ExecStartPre=-/bin/plymouth quit
-ExecStartPre=-/bin/echo -e 'Welcome to emergency mode! After logging in, type "journalctl -xb" to view\\nsystem logs, "systemctl reboot" to reboot, "systemctl default" to try again\\nto boot into default mode.'
+ExecStartPre=-/bin/echo -e 'Welcome to emergency mode! After logging in, type "journalctl -xb" to view\\nsystem logs, "systemctl reboot" to reboot, "systemctl default" or ^D to\\ntry again to boot into default mode.'
 ExecStart=-/bin/sh -c "/sbin/sulogin; @SYSTEMCTL@ --fail --no-block default"
 Type=idle
 StandardInput=tty-force