summaryrefslogtreecommitdiff
path: root/units/rescue.service.m4.in
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2013-01-04 22:38:11 +0100
committerLennart Poettering <lennart@poettering.net>2013-01-04 23:26:21 +0100
commit7f0086f8c9307a9a62f31a4aa5c8d3de74abd06b (patch)
treeb58ba0c9659fe0b7bf613d4aaa46227ec4605dce /units/rescue.service.m4.in
parent83514a2fa0c9377e76dcc323ab7e7756b7f86cc4 (diff)
units: always use sulogin in rescue.service
sushell makes much less sense than sulogin. If distros want to stick to sushell they should patch this downstream.
Diffstat (limited to 'units/rescue.service.m4.in')
-rw-r--r--units/rescue.service.m4.in11
1 files changed, 1 insertions, 10 deletions
diff --git a/units/rescue.service.m4.in b/units/rescue.service.m4.in
index fb14baf195..269797a12e 100644
--- a/units/rescue.service.m4.in
+++ b/units/rescue.service.m4.in
@@ -18,16 +18,7 @@ Environment=HOME=/root
WorkingDirectory=/root
ExecStartPre=-/bin/plymouth quit
ExecStartPre=-/bin/echo -e 'Welcome to rescue mode! Type "systemctl default" or ^D to enter default mode.\\nType "journalctl -xb" to view system logs. Type "systemctl reboot" to reboot.'
-m4_ifdef(`TARGET_FEDORA',
-`EnvironmentFile=/etc/sysconfig/init
-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}"',
-`ExecStart=-/sbin/sulogin')))
+ExecStart=-/sbin/sulogin
ExecStopPost=-@SYSTEMCTL@ --fail --no-block default
Type=idle
StandardInput=tty-force