X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=units%2Frescue.service.m4;h=7dd8a220b878088aef562066c897f680f9629a2f;hb=81beb7508e72b29ae7cec60b50231cbe0c1d582e;hp=d173bebabce134ee36183b9b1b70fe6dfa08244d;hpb=de47ca9b50e8c05c9fc116ff37794e526bddf92e;p=elogind.git

diff --git a/units/rescue.service.m4 b/units/rescue.service.m4
index d173bebab..7dd8a220b 100644
--- a/units/rescue.service.m4
+++ b/units/rescue.service.m4
@@ -11,22 +11,32 @@
 Description=Rescue Shell
 DefaultDependencies=no
 Conflicts=shutdown.target
-After=basic.target
+After=basic.target plymouth-start.service
 Before=shutdown.target
 
 [Service]
 Environment=HOME=/root
-Environment=TERM=vt100-nav
 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"',
-`ExecStart=-/sbin/sulogin')
-ExecStopPost=/bin/systemctl default
+ExecStart=-/bin/bash -c "exec ${SINGLE}"',
+m4_ifdef(`TARGET_MANDRIVA',
+`EnvironmentFile=/etc/sysconfig/init
+ExecStart=-/bin/bash -c "exec ${SINGLE}"',
+m4_ifdef(`TARGET_MAGEIA',
+`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.