untis: allow both console and plymouth ask password agents in boot transaction to...

[elogind.git] / units / rescue.service.m4

diff --git a/units/rescue.service.m4 b/units/rescue.service.m4
index ba29f6e6e6f14b4ed2577b33cedee303c2bcdf48..d2fd582e86e69a7203e46e3ead9a90589d91100d 100644 (file)
--- a/units/rescue.service.m4
+++ b/units/rescue.service.m4
@@ -17,15 +17,21 @@ 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 --fail default
+m4_ifdef(`TARGET_MANDRIVA',
+`EnvironmentFile=/etc/sysconfig/init
+ExecStart=-/bin/bash -c "exec ${SINGLE}"',
+`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.