X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=units%2Frescue.service.m4.in;h=fb14baf195b578c7302bbb3ea3de016dd399b270;hb=a5dea3d43b3866b48c66d6bef9663cf8372fd96c;hp=c736f83478c627d3bddcefd9ac4ac9061e6961dc;hpb=5430f7f2bc7330f3088b894166bf3524a067e3d8;p=elogind.git diff --git a/units/rescue.service.m4.in b/units/rescue.service.m4.in index c736f8347..fb14baf19 100644 --- a/units/rescue.service.m4.in +++ b/units/rescue.service.m4.in @@ -5,20 +5,19 @@ # the Free Software Foundation; either version 2.1 of the License, or # (at your option) any later version. -# See systemd.special(7) for details - [Unit] Description=Rescue Shell +Documentation=man:sulogin(8) DefaultDependencies=no Conflicts=shutdown.target -After=basic.target plymouth-start.service +After=sysinit.target plymouth-start.service Before=shutdown.target [Service] 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" to view system logs. Type "systemctl reboot" to reboot.' +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}"', @@ -28,11 +27,9 @@ 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')))) +`ExecStart=-/sbin/sulogin'))) ExecStopPost=-@SYSTEMCTL@ --fail --no-block default +Type=idle StandardInput=tty-force StandardOutput=inherit StandardError=inherit