populate-initrd: add new location for dracut source functions

diff --git a/configure.ac b/configure.ac
index ac92f113c7138fd6983d4b297525cecde80cc743..db29de886ec205ab7c4fd549d350193fef2741e4 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([plymouth],[0.8.4],[https://bugs.freedesktop.org/enter_bug.cgi?product=plymouth])
+AC_INIT([plymouth],[0.8.5],[https://bugs.freedesktop.org/enter_bug.cgi?product=plymouth])
 AC_CONFIG_SRCDIR(src/main.c)
 AC_CONFIG_HEADER(config.h)
 AC_CONFIG_AUX_DIR(build-tools)

diff --git a/scripts/plymouth-populate-initrd.in b/scripts/plymouth-populate-initrd.in
index 5352c69ba389936c484e39dc24cd17d63a81f593..aa25a395978654ed122ca6354571433de1ac784f 100755 (executable)
--- a/scripts/plymouth-populate-initrd.in
+++ b/scripts/plymouth-populate-initrd.in
@@ -22,6 +22,8 @@ if [ -z "$PLYMOUTH_POPULATE_SOURCE_FUNCTIONS" ]; then
         PLYMOUTH_POPULATE_SOURCE_FUNCTIONS="${PLYMOUTH_DATADIR}/dracut/dracut-functions.sh"
     elif [ -f "${PLYMOUTH_DATADIR}/dracut/dracut-functions" ]; then
         PLYMOUTH_POPULATE_SOURCE_FUNCTIONS="${PLYMOUTH_DATADIR}/dracut/dracut-functions"
+    elif [ -f "/usr/lib/dracut/dracut-functions.sh" ]; then
+        PLYMOUTH_POPULATE_SOURCE_FUNCTIONS="/usr/lib/dracut/dracut-functions.sh"
     fi
 fi