diff options
| -rw-r--r-- | test/test-functions | 2 | ||||
| -rw-r--r-- | units/emergency.service.in | 2 | ||||
| -rw-r--r-- | units/rescue.service.in | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/test/test-functions b/test/test-functions index de07eada56..d468efb0b7 100644 --- a/test/test-functions +++ b/test/test-functions @@ -879,7 +879,7 @@ install_execs() { # also, plymouth is pulled in by rescue.service, but even there the exit code # is ignored; as it's not present on some distros, don't fail if it doesn't exist dinfo "Attempting to install $i" - inst $i || [ "${i%.local}" != "$i" ] || [ "${i%systemd-update-done}" != "$i" ] || [ "/bin/plymouth" == "$i" ] + inst $i || [ "${i%.local}" != "$i" ] || [ "${i%systemd-update-done}" != "$i" ] || [ "${i##*/}" == "plymouth" ] done ) } diff --git a/units/emergency.service.in b/units/emergency.service.in index d259b6b112..180d9e6a57 100644 --- a/units/emergency.service.in +++ b/units/emergency.service.in @@ -19,7 +19,7 @@ Before=rescue.service [Service] Environment=HOME=/root WorkingDirectory=-/root -ExecStartPre=-/bin/plymouth --wait quit +ExecStartPre=-@rootbindir@/plymouth --wait quit ExecStart=-@rootlibexecdir@/systemd-sulogin-shell emergency Type=idle StandardInput=tty-force diff --git a/units/rescue.service.in b/units/rescue.service.in index 2a8f034b94..4106e2d9f7 100644 --- a/units/rescue.service.in +++ b/units/rescue.service.in @@ -18,7 +18,7 @@ Before=shutdown.target [Service] Environment=HOME=/root WorkingDirectory=-/root -ExecStartPre=-/bin/plymouth --wait quit +ExecStartPre=-@rootbindir@/plymouth --wait quit ExecStart=-@rootlibexecdir@/systemd-sulogin-shell rescue Type=idle StandardInput=tty-force |