From: Harald Hoyer <harald@redhat.com>
Date: Wed, 9 Sep 2009 16:01:42 +0000 (+0200)
Subject: plymouth: use /usr/libexec/plymouth/plymouth-populate-initrd if possible
X-Git-Tag: 002~54
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f9749f368f1e;p=thirdparty%2Fdracut-ng.git

plymouth: use /usr/libexec/plymouth/plymouth-populate-initrd if possible
---

diff --git a/modules.d/50plymouth/install b/modules.d/50plymouth/install
index eedf4f6ad..c2a9f1c6d 100755
--- a/modules.d/50plymouth/install
+++ b/modules.d/50plymouth/install
@@ -1,5 +1,14 @@
 #!/bin/bash
-. "$moddir"/plymouth-populate-initrd
+
+if grep -q nash /usr/libexec/plymouth/plymouth-populate-initrd \
+   || ! grep -q dracut-functions /usr/libexec/plymouth/plymouth-populate-initrd \
+   || [ ! -x /usr/libexec/plymouth/plymouth-populate-initrd ]; then
+    . "$moddir"/plymouth-populate-initrd
+else
+    PLYMOUTH_POPULATE_SOURCE_FUNCTIONS="$dracutfunctions" \
+        /usr/libexec/plymouth/plymouth-populate-initrd -t $initdir
+fi
+
 inst_hook cmdline 30 "$moddir/parse-plymouth.sh"
 inst_hook pre-pivot 90 "$moddir"/plymouth-newroot.sh
 inst_hook pre-trigger 10 "$moddir"/plymouth-pretrigger.sh