|
 |
64b87c |
From b334c83e4abdc1dd87276fa7de4617cd349a5a4f Mon Sep 17 00:00:00 2001
|
|
|
64b87c |
From: Harald Hoyer <harald@redhat.com>
|
|
|
64b87c |
Date: Thu, 3 Sep 2015 12:41:44 +0200
|
|
|
64b87c |
Subject: [PATCH] network: move "ip=ibft" handling to network module
|
|
|
64b87c |
|
|
|
64b87c |
---
|
|
|
64b87c |
modules.d/40network/module-setup.sh | 1 +
|
|
|
64b87c |
modules.d/40network/parse-ibft.sh | 2 ++
|
|
|
64b87c |
modules.d/95iscsi/parse-iscsiroot.sh | 2 +-
|
|
|
64b87c |
3 files changed, 4 insertions(+), 1 deletion(-)
|
|
|
64b87c |
|
|
|
64b87c |
diff --git a/modules.d/40network/module-setup.sh b/modules.d/40network/module-setup.sh
|
|
|
1755ca |
index 3134b5ff..6cbbe8f7 100755
|
|
|
64b87c |
--- a/modules.d/40network/module-setup.sh
|
|
|
64b87c |
+++ b/modules.d/40network/module-setup.sh
|
|
|
64b87c |
@@ -64,6 +64,7 @@ installkernel() {
|
|
|
64b87c |
=drivers/net/team \
|
|
|
64b87c |
=drivers/net/ethernet \
|
|
|
64b87c |
ecb arc4 bridge stp llc ipv6 bonding 8021q af_packet virtio_net
|
|
|
64b87c |
+ hostonly="" instmods iscsi_ibft crc32c iscsi_boot_sysfs
|
|
|
64b87c |
}
|
|
|
64b87c |
|
|
|
64b87c |
install() {
|
|
|
64b87c |
diff --git a/modules.d/40network/parse-ibft.sh b/modules.d/40network/parse-ibft.sh
|
|
|
1755ca |
index 643313dc..6f7f4e95 100755
|
|
|
64b87c |
--- a/modules.d/40network/parse-ibft.sh
|
|
|
64b87c |
+++ b/modules.d/40network/parse-ibft.sh
|
|
|
64b87c |
@@ -6,5 +6,7 @@ command -v getarg >/dev/null || . /lib/dracut-lib.sh
|
|
|
64b87c |
command -v ibft_to_cmdline >/dev/null || . /lib/net-lib.sh
|
|
|
64b87c |
|
|
|
64b87c |
if getargbool 0 rd.iscsi.ibft -d "ip=ibft"; then
|
|
|
64b87c |
+ modprobe -b -q iscsi_boot_sysfs 2>/dev/null
|
|
|
64b87c |
+ modprobe -b -q iscsi_ibft
|
|
|
64b87c |
ibft_to_cmdline
|
|
|
64b87c |
fi
|
|
|
64b87c |
diff --git a/modules.d/95iscsi/parse-iscsiroot.sh b/modules.d/95iscsi/parse-iscsiroot.sh
|
|
|
1755ca |
index 6aa14f5b..9546f126 100755
|
|
|
64b87c |
--- a/modules.d/95iscsi/parse-iscsiroot.sh
|
|
|
64b87c |
+++ b/modules.d/95iscsi/parse-iscsiroot.sh
|
|
|
64b87c |
@@ -71,7 +71,7 @@ if [ -n "$iscsiroot" ] ; then
|
|
|
64b87c |
fi
|
|
|
64b87c |
|
|
|
64b87c |
# iscsi_firmware does not need argument checking
|
|
|
64b87c |
-if [ -n "$iscsi_firmware" ] || getargbool 0 rd.iscsi.ibft -d "ip=ibft"; then
|
|
|
64b87c |
+if [ -n "$iscsi_firmware" ]; then
|
|
|
64b87c |
if [ "$root" != "dhcp" ] && [ "$netroot" != "dhcp" ]; then
|
|
|
64b87c |
[ -z "$netroot" ] && netroot=iscsi:
|
|
|
64b87c |
fi
|