From: Ray Strode <rstrode@redhat.com>
Date: Wed, 4 Apr 2012 19:02:53 +0000 (-0400)
Subject: populate-initrd: add new location for dracut source functions
X-Git-Tag: 0.8.5~32
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=270615b51696d712fa1fe7bb17e544d97beafc75;p=thirdparty%2Fplymouth.git

populate-initrd: add new location for dracut source functions
---

diff --git a/configure.ac b/configure.ac
index ac92f113..db29de88 100644
--- 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 5352c69b..aa25a395 100755
--- 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