network: move "ip=ibft" handling to network module

diff --git a/modules.d/40network/module-setup.sh b/modules.d/40network/module-setup.sh
index 3134b5ff4f7f18d1cc938a54c7fd55ea59c4e46e..6cbbe8f744f9cc9ff3b9f23a33eae0968a509987 100755 (executable)
--- a/modules.d/40network/module-setup.sh
+++ b/modules.d/40network/module-setup.sh
@@ -64,6 +64,7 @@ installkernel() {
         =drivers/net/team \
         =drivers/net/ethernet \
         ecb arc4 bridge stp llc ipv6 bonding 8021q af_packet virtio_net
+    hostonly="" instmods iscsi_ibft crc32c iscsi_boot_sysfs
 }
 
 install() {

diff --git a/modules.d/40network/parse-ibft.sh b/modules.d/40network/parse-ibft.sh
index 643313dc2e6d6c147967077123f2a996dd25ccdb..6f7f4e95685011201f4b7a56d3d484780d297776 100755 (executable)
--- a/modules.d/40network/parse-ibft.sh
+++ b/modules.d/40network/parse-ibft.sh
@@ -6,5 +6,7 @@ command -v getarg >/dev/null          || . /lib/dracut-lib.sh
 command -v ibft_to_cmdline >/dev/null || . /lib/net-lib.sh
 
 if getargbool 0 rd.iscsi.ibft -d "ip=ibft"; then
+    modprobe -b -q iscsi_boot_sysfs 2>/dev/null
+    modprobe -b -q iscsi_ibft
     ibft_to_cmdline
 fi

diff --git a/modules.d/95iscsi/parse-iscsiroot.sh b/modules.d/95iscsi/parse-iscsiroot.sh
index 6aa14f5b8ebdb566704b439e228fa287f66bad75..9546f126a021d011a88d6d1ea7810e3f96840fd8 100755 (executable)
--- a/modules.d/95iscsi/parse-iscsiroot.sh
+++ b/modules.d/95iscsi/parse-iscsiroot.sh
@@ -71,7 +71,7 @@ if [ -n "$iscsiroot" ] ; then
 fi
 
 # iscsi_firmware does not need argument checking
-if [ -n "$iscsi_firmware" ] || getargbool 0 rd.iscsi.ibft -d "ip=ibft"; then
+if [ -n "$iscsi_firmware" ]; then
     if [ "$root" != "dhcp" ] && [ "$netroot" != "dhcp" ]; then
         [ -z "$netroot" ] && netroot=iscsi:
     fi