diff options
author | Cristian RodrÃguez <crrodriguez@opensuse.org> | 2013-04-14 21:16:49 -0300 |
---|---|---|
committer | Ray Strode <rstrode@redhat.com> | 2013-04-16 08:48:05 -0400 |
commit | e83a754b91dd2b21604516d0c7b201ae14da46c3 (patch) | |
tree | 04e7d09227f6baf15c202a6ee3867759e8830ec3 | |
parent | de67b2d021f0f3cbc65feec5f7903bd4e94605dd (diff) |
Lookup the location of udevadm
It is not always in /bin , but /usr/...
-rw-r--r-- | configure.ac | 1 | ||||
-rw-r--r-- | systemd-units/plymouth-start.service.in | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index b14bbd2e..bb0207d5 100644 --- a/configure.ac +++ b/configure.ac @@ -42,12 +42,13 @@ PLYMOUTH_CFLAGS="" 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_PATH_PROG([UDEVADM], [udevadm]) 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]) if test x$enable_pango = xyes; then PKG_CHECK_MODULES(PANGO, [pangocairo >= 1.21.0 ]) diff --git a/systemd-units/plymouth-start.service.in b/systemd-units/plymouth-start.service.in index 951e8d6d..50e32e32 100644 --- a/systemd-units/plymouth-start.service.in +++ b/systemd-units/plymouth-start.service.in @@ -5,12 +5,12 @@ Wants=systemd-ask-password-plymouth.path systemd-vconsole-setup.service After=systemd-vconsole-setup.service systemd-udev-trigger.service Before=systemd-ask-password-plymouth.service ConditionKernelCommandLine=!plymouth.enable=0 [Service] ExecStart=@PLYMOUTH_DAEMON_DIR@/plymouthd --mode=boot --pid-file=@plymouthruntimedir@/pid --attach-to-session -ExecStartPost=-/bin/udevadm settle --timeout=30 --exit-if-exists=/sys/class/drm/card0/dev ; /bin/udevadm settle --timeout=30 --exit-if-exists=/sys/class/graphics/fb0/dev ; @PLYMOUTH_CLIENT_DIR@/plymouth show-splash +ExecStartPost=-@UDEVADM@ settle --timeout=30 --exit-if-exists=/sys/class/drm/card0/dev ; @UDEVADM@ settle --timeout=30 --exit-if-exists=/sys/class/graphics/fb0/dev ; @PLYMOUTH_CLIENT_DIR@/plymouth show-splash Type=forking KillMode=none SendSIGKILL=no [Install] WantedBy=sysinit.target |