From 7f0086f8c9307a9a62f31a4aa5c8d3de74abd06b Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 4 Jan 2013 22:38:11 +0100 Subject: [PATCH] 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. --- units/rescue.service.m4.in | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/units/rescue.service.m4.in b/units/rescue.service.m4.in index fb14baf19..269797a12 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 -- 2.30.2