diff options
| author | Cristian RodrÃguez <crrodriguez@opensuse.org> | 2013-04-13 16:17:51 -0300 |
|---|---|---|
| committer | Ray Strode <rstrode@redhat.com> | 2013-04-14 12:06:38 -0400 |
| commit | 8f373680dd09345838e269ddfbab1f48d2dd1efb (patch) | |
| tree | 55348ac6cbd34b1d3fbf8171ea64080c5fae0f00 | |
| parent | 32ae2addfb1955e0584f16299c745e23efd3a299 (diff) | |
systemd: Look up systemd-tty-ask-password-agent location
Don't assume it's in /bin.
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | systemd-units/systemd-ask-password-plymouth.service.in | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index c20974e2..7154aaf1 100644 --- 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 aa9ffc21..0c3acde9 100644 --- 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 |