chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
man: Documentation spelling fixes
[elogind.git]
/
units
/
rescue.service.m4
diff --git
a/units/rescue.service.m4
b/units/rescue.service.m4
index 8b42e9f690c75fbde95099b3d9ea0ad70038ef23..d2fd582e86e69a7203e46e3ead9a90589d91100d 100644
(file)
--- a/
units/rescue.service.m4
+++ b/
units/rescue.service.m4
@@
-13,9
+13,6
@@
DefaultDependencies=no
Conflicts=shutdown.target
After=basic.target
Before=shutdown.target
Conflicts=shutdown.target
After=basic.target
Before=shutdown.target
-m4_ifdef(`TARGET_MANDRIVA',
-`# Hide SysV script
-Names=single.service')
[Service]
Environment=HOME=/root
[Service]
Environment=HOME=/root
@@
-28,10
+25,13
@@
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
+`ExecStart=-/sbin/sulogin'
+m4_ifdef(`TARGET_MEEGO',
+`EnvironmentFile=/etc/sysconfig/init
+ExecStart=-/bin/bash -c "exec ${SINGLE}"',)))
+ExecStopPost=-/bin/systemctl --fail --no-block 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.