3ca4ad45d0
- 90multipath: parse commandline option 'multipath=off' (bsc#1001691) *add 0307-90multipath-parse-kernel-commandline-option-multipat.patch - 95fcoe: do not start fcoemon twice (bsc#1001512) *add 0225-95fcoe-do-not-start-fcoemon-twice.patch - Reformat patch headers: *modify 0199-rd-iscsi-waitnet-default-false.patch *modify 0200-dracut_fix_multipath_without_config.patch *modify 0210-add_fcoe_uefi_check.patch *modify 0212-fcoe_reorder_init_path.patch - Rediff patches to apply cleanly: *modify 0124-40network-Update-iBFT-scanning-code-to-handle-IPv6.patch *modify 0133-Allow-multiple-configurations-per-network-interface-.patch *modify 0170-iscsi-skip-ibft-invalid-dhcp.patch *modify 0218-40network-allow-persistent-interface-names.patch - Remove spurious whitespaces: *modify 0169-network_set_mtu_macaddr_for_dhcp.patch - 40network: print out correct prefix (bsc#996141) *modify 0125-40network-separate-mask-and-prefix.patch - 95iscsi: setup bnx2i offload connection correctly (bsc#997598) *add 0224-95iscsi-setup-bnx2i-offload-connections-properly.patch - Rename patches to match sequence number: *old: 0019-40network-Fix-race-condition-when-wait-for-networks.patch *new: 0012-40network-Fix-race-condition-when-wait-for-networks.patch *old: 0066-40network-always-start-netroot-in-ifup.sh.patch *new: 0013-40network-always-start-netroot-in-ifup.sh.patch - rd.iscsi.waitnet should default to false in order for dracut to wait for the network devices (bsc#997598) OBS-URL: https://build.opensuse.org/request/show/431190 OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=267
51 lines
1.7 KiB
Diff
51 lines
1.7 KiB
Diff
From 3ac0a07b762d115b385aa05abcb0c1559f932319 Mon Sep 17 00:00:00 2001
|
|
From: Hannes Reinecke <hare@suse.de>
|
|
Date: Tue, 27 Sep 2016 12:51:09 +0200
|
|
Subject: 95iscsi: setup bnx2i offload connections properly
|
|
|
|
bnx2i offload connections do not have a corresponding network
|
|
device, but needs the 'iscsiuio' daemon to be started.
|
|
|
|
References: bsc#997598
|
|
|
|
Signed-off-by: Hannes Reinecke <hare@suse.com>
|
|
---
|
|
modules.d/95iscsi/iscsiroot.sh | 8 +++-----
|
|
modules.d/95iscsi/module-setup.sh | 1 +
|
|
2 files changed, 4 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/modules.d/95iscsi/iscsiroot.sh b/modules.d/95iscsi/iscsiroot.sh
|
|
index 6f0a15d..6ad279f 100755
|
|
--- a/modules.d/95iscsi/iscsiroot.sh
|
|
+++ b/modules.d/95iscsi/iscsiroot.sh
|
|
@@ -264,11 +264,9 @@ if [ "$netif" = "timeout" ] && all_ifaces_setup; then
|
|
fi
|
|
|
|
if getargbool 0 rd.iscsi.firmware -d -y iscsi_firmware ; then
|
|
- if [ "$netif" = "timeout" ] || [ "$netif" = "online" ]; then
|
|
- [ -f /tmp/session-retry ] || echo 1 > /tmp/session-retry
|
|
- handle_firmware
|
|
- ret=$?
|
|
- fi
|
|
+ [ -f /tmp/session-retry ] || echo 1 > /tmp/session-retry
|
|
+ handle_firmware
|
|
+ ret=$?
|
|
fi
|
|
|
|
if ! [ "$netif" = "online" ]; then
|
|
diff --git a/modules.d/95iscsi/module-setup.sh b/modules.d/95iscsi/module-setup.sh
|
|
index 797d4e1..e272b24 100755
|
|
--- a/modules.d/95iscsi/module-setup.sh
|
|
+++ b/modules.d/95iscsi/module-setup.sh
|
|
@@ -279,6 +279,7 @@ install() {
|
|
mkdir -p "${initdir}/$systemdsystemunitdir/basic.target.wants"
|
|
for i in \
|
|
iscsid.service \
|
|
+ iscsiuio.service \
|
|
; do
|
|
ln_r "$systemdsystemunitdir/${i}" "$systemdsystemunitdir/basic.target.wants/${i}"
|
|
done
|
|
--
|
|
2.6.6
|
|
|