From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 7 Apr 2020 12:00:28 +0000 (+0200)
Subject: units: use correct path to refer to plymouth
X-Git-Tag: v246-rc1~578
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e46736fbb6a81db4e9dfdcb0daceeade4a4b67ca;p=thirdparty%2Fsystemd.git

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 de07eada569..d468efb0b7b 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 d259b6b112a..180d9e6a57c 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 2a8f034b94b..4106e2d9f75 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