From: Martin Wilck <mwilck@suse.com>
Date: Mon, 9 Sep 2024 07:43:01 +0000 (+0200)
Subject: fix(nvmf): install (only) required nvmf modules
X-Git-Tag: 104~44
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3748ed4db5255c516cd60c2d710532d79878a498;p=thirdparty%2Fdracut-ng.git

fix(nvmf): install (only) required nvmf modules

nvme_rdma was not installed, even if it was required, whereas
nvme_tcp was installed in non-TCP setups. nvme_fabrics will be
pulled in automatically by any transport module and doesn't
need to be installed explicitly.

Fix it.
---

diff --git a/modules.d/95nvmf/module-setup.sh b/modules.d/95nvmf/module-setup.sh
index 15b74b78a..0b88044c8 100755
--- a/modules.d/95nvmf/module-setup.sh
+++ b/modules.d/95nvmf/module-setup.sh
@@ -69,8 +69,9 @@ depends() {
 
 # called by dracut
 installkernel() {
-    instmods nvme_fc lpfc qla2xxx
-    hostonly="" instmods nvme_tcp nvme_fabrics 8021q
+    instmods nvme_fc nvme_tcp nvme_rdma lpfc qla2xxx
+    # 802.1q VLAN may be set up in Firmware later. Include the module always.
+    hostonly="" instmods 8021q
 }
 
 # called by dracut