X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=units%2Frescue.service.m4;h=19b30d89f95f8714bfe7ea94d1fa9bab70b70f6a;hb=3e085b6c59257ca57534afc5044256f2102f9c28;hp=b48d085024060c7c383a741eaf9863686e578051;hpb=7f62e3774c08a9c14d9f69de1ae8830e94f8f1ec;p=elogind.git diff --git a/units/rescue.service.m4 b/units/rescue.service.m4 index b48d08502..19b30d89f 100644 --- a/units/rescue.service.m4 +++ b/units/rescue.service.m4 @@ -11,7 +11,7 @@ Description=Rescue Shell DefaultDependencies=no Conflicts=shutdown.target -After=basic.target +After=basic.target plymouth-start.service Before=shutdown.target [Service] @@ -25,9 +25,14 @@ ExecStart=-/bin/bash -c "exec ${SINGLE}"', 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}"', +`ExecStart=-/sbin/sulogin'))) ExecStopPost=-/bin/systemctl --fail --no-block default StandardInput=tty-force +StandardOutput=inherit +StandardError=inherit KillMode=process # Bash ignores SIGTERM, so we send SIGHUP instead, to ensure that bash