]> git.ipfire.org Git - thirdparty/dracut.git/commitdiff
plymouth: also find the pkglibdir on debian
authorHarald Hoyer <harald@redhat.com>
Tue, 8 Jul 2014 09:50:51 +0000 (11:50 +0200)
committerHarald Hoyer <harald@redhat.com>
Tue, 8 Jul 2014 09:50:51 +0000 (11:50 +0200)
modules.d/50plymouth/module-setup.sh

index b818324f59817828443af728a7e8f32c01e98f85..33fab11558fac29a5d999cf04b82d424fbf0a4a1 100755 (executable)
@@ -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