systemd: Look up systemd-tty-ask-password-agent location

Don't assume it's in /bin.

diff --git a/configure.ac b/configure.ac
index c20974e2061da0b230d8fe2cd5d788d260457d3c..7154aaf1313f0b310b5a5a790fdff1ad79c3f31b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -44,6 +44,8 @@ PLYMOUTH_LIBS="-lm -lrt -ldl"
 AC_SUBST(PLYMOUTH_CFLAGS)
 AC_SUBST(PLYMOUTH_LIBS)
 
+AC_PATH_PROG([SYSTEMD_ASK_PASSWORD_AGENT], [systemd-tty-ask-password-agent])
+
 AC_ARG_ENABLE(pango, AS_HELP_STRING([--enable-pango],[enable building with pango, disabled there is no encryption prompts]),enable_pango=$enableval,enable_pango=yes)
 AM_CONDITIONAL(ENABLE_PANGO,  [test "$enable_pango" = yes])
 

diff --git a/systemd-units/systemd-ask-password-plymouth.service.in b/systemd-units/systemd-ask-password-plymouth.service.in
index aa9ffc21708f97bc8cbb35c56331e05b01aa839d..0c3acde9fb01466a1dcc6d8af644e33117bc5907 100644 (file)
--- a/systemd-units/systemd-ask-password-plymouth.service.in
+++ b/systemd-units/systemd-ask-password-plymouth.service.in
@@ -9,4 +9,4 @@ ConditionKernelCommandLine=!plymouth.enable=0
 ConditionPathExists=/run/plymouth/pid
 
 [Service]
-ExecStart=/bin/systemd-tty-ask-password-agent --watch --plymouth
+ExecStart=@SYSTEMD_ASK_PASSWORD_AGENT@ --watch --plymouth