chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
src: our lord is coverity
[elogind.git]
/
units
/
rescue.service.m4
diff --git
a/units/rescue.service.m4
b/units/rescue.service.m4
index 6e03c20d80b8afaf6e2cef9918e4f05e4a9d58d5..241c75071f635d42517ee8f830e7ec554388a62b 100644
(file)
--- a/
units/rescue.service.m4
+++ b/
units/rescue.service.m4
@@
-17,15
+17,18
@@
Before=shutdown.target
[Service]
Environment=HOME=/root
WorkingDirectory=/root
[Service]
Environment=HOME=/root
WorkingDirectory=/root
-ExecStartPre=-/bin/plymouth
--hide-splash
+ExecStartPre=-/bin/plymouth
quit
ExecStartPre=-/bin/echo 'Welcome to rescue mode. Use "systemctl default" or ^D to activate default mode.'
m4_ifdef(`TARGET_FEDORA',
`EnvironmentFile=/etc/sysconfig/init
ExecStart=-/bin/bash -c "exec ${SINGLE}"',
ExecStartPre=-/bin/echo 'Welcome to rescue mode. Use "systemctl default" or ^D to activate default mode.'
m4_ifdef(`TARGET_FEDORA',
`EnvironmentFile=/etc/sysconfig/init
ExecStart=-/bin/bash -c "exec ${SINGLE}"',
-`ExecStart=-/sbin/sulogin')
-ExecStopPost=/bin/systemctl default
+m4_ifdef(`TARGET_MANDRIVA',
+`EnvironmentFile=/etc/sysconfig/init
+ExecStart=-/bin/bash -c "exec ${SINGLE}"',
+`ExecStart=-/sbin/sulogin'))
+ExecStopPost=-/bin/systemctl --fail default
StandardInput=tty-force
StandardInput=tty-force
-KillMode=process
-group
+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.