From: Daniel Molkentin <dmolkentin@suse.com>
Date: Mon, 1 Mar 2021 15:44:56 +0000 (+0100)
Subject: fix(kernel-modules): optionally add /usr/lib/modules.d to initramfs
X-Git-Tag: 054~338
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=92e6a8f87914322994387e559cf2a00b1760b301;p=thirdparty%2Fdracut.git

fix(kernel-modules): optionally add /usr/lib/modules.d to initramfs

On SUSE, there is no /lib/modules.d, only /usr/lib/modules.d.

Upstream-Bug: http://bugzilla.opensuse.org/show_bug.cgi?id=1180822

Reference: bsc#1180822
---

diff --git a/modules.d/90kernel-modules/module-setup.sh b/modules.d/90kernel-modules/module-setup.sh
index bd8e97b50..7703d4632 100755
--- a/modules.d/90kernel-modules/module-setup.sh
+++ b/modules.d/90kernel-modules/module-setup.sh
@@ -141,7 +141,8 @@ installkernel() {
 
 # called by dracut
 install() {
-    inst_multiple -o "/lib/modprobe.d/*.conf"
+    [[ -d /lib/modprobe.d ]] && inst_multiple -o "/lib/modprobe.d/*.conf"
+    [[ -d /usr/lib/modprobe.d ]] && inst_multiple -o "/usr/lib/modprobe.d/*.conf"
     [[ $hostonly ]] && inst_multiple -H -o /etc/modprobe.d/*.conf /etc/modprobe.conf
     if ! dracut_module_included "systemd"; then
         inst_hook cmdline 01 "$moddir/parse-kernel.sh"