X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=units%2Frescue.service.m4;h=8f29de8a15c038471cec5921f311df433be74278;hp=2a0d3280ecebd729bd57ec0b76886e6cca36c9c7;hb=7ef5875d142f01ab4fe8d35412d48c10723ae2d4;hpb=be12dd0cb89214b3b0dbffe70dd47d1db2c5d3c2

diff --git a/units/rescue.service.m4 b/units/rescue.service.m4
index 2a0d3280e..8f29de8a1 100644
--- a/units/rescue.service.m4
+++ b/units/rescue.service.m4
@@ -22,10 +22,18 @@ ExecStartPre=-/bin/echo 'Welcome to rescue mode. Use "systemctl default" or ^D t
 m4_ifdef(`TARGET_FEDORA',
 `EnvironmentFile=/etc/sysconfig/init
 ExecStart=-/bin/bash -c "exec ${SINGLE}"',
-`ExecStart=-/sbin/sulogin')
-ExecStopPost=-/bin/systemctl --fail default
+m4_ifdef(`TARGET_MANDRIVA',
+`EnvironmentFile=/etc/sysconfig/init
+ExecStart=-/bin/bash -c "exec ${SINGLE}"',
+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
-KillMode=process-group
+StandardOutput=inherit
+StandardError=inherit
+KillMode=process
 
 # Bash ignores SIGTERM, so we send SIGHUP instead, to ensure that bash
 # terminates cleanly.