X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=units%2Frescue.service.m4.in;h=5fb82e614d18a3d45af46afe14157ff7fb1c45bf;hb=11901ad59689002aa7bbf598e76617f1cfeebd34;hp=df0b54fd608b4bdb1a7705d1ff24388a5cdd0372;hpb=9cf2578683de834026f501c24a0f5d3d0991d0a6;p=elogind.git diff --git a/units/rescue.service.m4.in b/units/rescue.service.m4.in index df0b54fd6..5fb82e614 100644 --- a/units/rescue.service.m4.in +++ b/units/rescue.service.m4.in @@ -1,24 +1,22 @@ # This file is part of systemd. # # systemd is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# under the terms of the GNU Lesser General Public License as published by +# 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 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 'Welcome to rescue mode. Use "systemctl default" or ^D to enter default mode.' +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.' m4_ifdef(`TARGET_FEDORA', `EnvironmentFile=/etc/sysconfig/init ExecStart=-/bin/bash -c "exec ${SINGLE}"', @@ -33,6 +31,7 @@ m4_ifdef(`TARGET_MEEGO', ExecStart=-/bin/bash -c "exec ${SINGLE}"', `ExecStart=-/sbin/sulogin')))) ExecStopPost=-@SYSTEMCTL@ --fail --no-block default +Type=idle StandardInput=tty-force StandardOutput=inherit StandardError=inherit