units: use correct path to refer to plymouth

This doesn't really matter, since in non-/usr-merged systems plymouth
needs to be in /bin and on merged ones it doesn't matter, but it is
still prettier to insert the right path, and avoid /bin on merged
systems, since it's just a compat symlink.

Replaces: #15351

diff --git a/test/test-functions b/test/test-functions
index de07eada56970c99470eb22758c61600de9b0c7c..d468efb0b7bb712c428f635bae8b582aa74a4b01 100644 (file)
--- 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 d259b6b112ae8a9f41a047264c2e086cae26f104..180d9e6a57c9b7a42cd7916396f0552bf98c9285 100644 (file)
--- 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 2a8f034b94bbc8d656fefbaa91c99994a8520583..4106e2d9f751a873b16d7f2349bde459757abb41 100644 (file)
--- 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