From: Harald Hoyer <harald@redhat.com>
Date: Tue, 8 Jul 2014 09:50:51 +0000 (+0200)
Subject: plymouth: also find the pkglibdir on debian
X-Git-Tag: 039~63
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4adeefc4abb8fb1d83e483d12da6b337c486fded;p=thirdparty%2Fdracut.git

plymouth: also find the pkglibdir on debian
---

diff --git a/modules.d/50plymouth/module-setup.sh b/modules.d/50plymouth/module-setup.sh
index b818324f5..33fab1155 100755
--- a/modules.d/50plymouth/module-setup.sh
+++ b/modules.d/50plymouth/module-setup.sh
@@ -15,12 +15,18 @@ depends() {
 
 # called by dracut
 install() {
-    if grep -q nash /usr/libexec/plymouth/plymouth-populate-initrd \
-        || [ ! -x /usr/libexec/plymouth/plymouth-populate-initrd ]; then
+    PKGLIBDIR="/usr/lib/plymouth"
+    if type -P dpkg-architecture &>/dev/null; then
+        PKGLIBDIR="/usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)/plymouth"
+    fi
+    [ -x /usr/libexec/plymouth/plymouth-populate-initrd ] && PKGLIBDIR="/usr/libexec/plymouth"
+
+    if grep -q nash ${PKGLIBDIR}/plymouth-populate-initrd \
+        || [ ! -x ${PKGLIBDIR}/plymouth-populate-initrd ]; then
         . "$moddir"/plymouth-populate-initrd.sh
     else
         PLYMOUTH_POPULATE_SOURCE_FUNCTIONS="$dracutfunctions" \
-            /usr/libexec/plymouth/plymouth-populate-initrd -t "$initdir"
+            ${PKGLIBDIR}/plymouth-populate-initrd -t "$initdir"
     fi
 
     inst_hook emergency 50 "$moddir"/plymouth-emergency.sh