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: move a couple of units from base.target to sysinit.target
[elogind.git]
/
units
/
emergency.service
diff --git
a/units/emergency.service
b/units/emergency.service
index a5a54bc9d23e4b4e452c8f8cec218b873ba50a55..aa3d9856c03a3d5596d7f701e56dce452dd66465 100644
(file)
--- a/
units/emergency.service
+++ b/
units/emergency.service
@@
-10,17
+10,19
@@
[Unit]
Description=Emergency Shell
DefaultDependencies=no
[Unit]
Description=Emergency Shell
DefaultDependencies=no
-After=shutdown.target
+Conflicts=shutdown.target
+Before=shutdown.target
[Service]
[Service]
+Environment=HOME=/root
+WorkingDirectory=/root
ExecStartPre=-/bin/plymouth --hide-splash
ExecStartPre=-/bin/plymouth --hide-splash
-ExecStartPre=-/bin/echo 'Welcome to emergency mode. Use "systemctl default" to activate default mode.'
-ExecStart=/bin/sh
+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
StandardInput=tty-force
-Restart=restart-always
-RestartSec=0
KillMode=process-group
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.
# terminates cleanly.
-ExecStop=-/bin/kill -HUP $(MAINPID)
+KillSignal=SIGHUP