chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
units: deal properly with the fact that agetty is called getty on Debian
[elogind.git]
/
units
/
emergency.service
diff --git
a/units/emergency.service
b/units/emergency.service
index 8e378482c1ba41f977eaaedd99c4c2950fa2e7ba..52f875c6f39d37d89ecc3ee2805f7b67c8d212cb 100644
(file)
--- a/
units/emergency.service
+++ b/
units/emergency.service
@@
-10,16
+10,18
@@
[Unit]
Description=Emergency Shell
DefaultDependencies=no
[Unit]
Description=Emergency Shell
DefaultDependencies=no
+Conflicts=shutdown.target
+Before=shutdown.target
[Service]
Environment=HOME=/root
[Service]
Environment=HOME=/root
+Environment=TERM=vt100-nav
WorkingDirectory=/root
ExecStartPre=-/bin/plymouth --hide-splash
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
ExecStart=-/sbin/sulogin
+ExecStopPost=/bin/systemctl default
StandardInput=tty-force
StandardInput=tty-force
-Restart=restart-always
-RestartSec=0
KillMode=process-group
# Bash ignores SIGTERM, so we send SIGHUP instead, to ensure that bash
KillMode=process-group
# Bash ignores SIGTERM, so we send SIGHUP instead, to ensure that bash