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: fix rescue.service race with plymouth
[elogind.git]
/
units
/
rescue.service.m4
diff --git
a/units/rescue.service.m4
b/units/rescue.service.m4
index 969ac4728f7176d1fa83d9c06bfdc90bc64dfe8d..19b30d89f95f8714bfe7ea94d1fa9bab70b70f6a 100644
(file)
--- a/
units/rescue.service.m4
+++ b/
units/rescue.service.m4
@@
-11,7
+11,7
@@
Description=Rescue Shell
DefaultDependencies=no
Conflicts=shutdown.target
Description=Rescue Shell
DefaultDependencies=no
Conflicts=shutdown.target
-After=basic.target
+After=basic.target
plymouth-start.service
Before=shutdown.target
[Service]
Before=shutdown.target
[Service]
@@
-25,10
+25,15
@@
ExecStart=-/bin/bash -c "exec ${SINGLE}"',
m4_ifdef(`TARGET_MANDRIVA',
`EnvironmentFile=/etc/sysconfig/init
ExecStart=-/bin/bash -c "exec ${SINGLE}"',
m4_ifdef(`TARGET_MANDRIVA',
`EnvironmentFile=/etc/sysconfig/init
ExecStart=-/bin/bash -c "exec ${SINGLE}"',
-`ExecStart=-/sbin/sulogin'))
-ExecStopPost=-/bin/systemctl --fail default
+m4_ifdef(`TARGET_MEEGO',
+`EnvironmentFile=/etc/sysconfig/init
+ExecStart=-/bin/bash -c "exec ${SINGLE}"',
+`ExecStart=-/sbin/sulogin')))
+ExecStopPost=-/bin/systemctl --fail --no-block default
StandardInput=tty-force
StandardInput=tty-force
-KillMode=process-group
+StandardOutput=inherit
+StandardError=inherit
+KillMode=process
# Bash ignores SIGTERM, so we send SIGHUP instead, to ensure that bash
# terminates cleanly.
# Bash ignores SIGTERM, so we send SIGHUP instead, to ensure that bash
# terminates cleanly.