From: Benjamin Drung <benjamin.drung@canonical.com>
Date: Mon, 29 Sep 2025 22:22:40 +0000 (+0200)
Subject: fix(plymouth): check all library directories for Plymouth
X-Git-Tag: 109~59
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1ac7e21ef679aefc2aa6a9b90257c2ed0ceaba9e;p=thirdparty%2Fdracut-ng.git

fix(plymouth): check all library directories for Plymouth

On amd64 `dpkg-architecture -qDEB_HOST_MULTIARCH` returns
`x86_64-linux-gnu` but `uname -m` returns only `x86_64`.
`/usr/lib/x86_64` does not exist on Debian/Ubuntu but
`/usr/lib/x86_64-linux-gnu` exists.

Rely on `libdirs` to provide all possible library directories including
the Debian multiarch directory `/usr/lib/x86_64-linux-gnu`.

Fixes: 1b374931126c ("fix(plymouth): do not depend on dpkg-architecture")
---

diff --git a/modules.d/45plymouth/module-setup.sh b/modules.d/45plymouth/module-setup.sh
index 9c916ad9b..455e26297 100755
--- a/modules.d/45plymouth/module-setup.sh
+++ b/modules.d/45plymouth/module-setup.sh
@@ -1,12 +1,9 @@
 #!/bin/bash
 
 pkglib_dir() {
-    local _dirs="/usr/lib/plymouth /usr/libexec/plymouth/"
-    local _arch=${DRACUT_ARCH:-$(uname -m)}
-    [ -n "$_arch" ] && _dirs+=" /usr/lib/$_arch/plymouth"
-    for _dir in $_dirs; do
-        if [ -x "${dracutsysrootdir-}$_dir"/plymouth-populate-initrd ]; then
-            echo "$_dir"
+    for _dir in /usr/libexec $libdirs; do
+        if [ -x "${dracutsysrootdir-}$_dir/plymouth/plymouth-populate-initrd" ]; then
+            echo "$_dir/plymouth"
             return
         fi
     done