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
59 lines
1.6 KiB
Diff
59 lines
1.6 KiB
Diff
From 77b3a15c6673dfce2dbd76cceffb7d5d4819c694 Mon Sep 17 00:00:00 2001
|
|
From: Johannes Thumshirn <jthumshirn@suse.com>
|
|
Date: Tue, 27 Sep 2016 12:41:22 +0200
|
|
Subject: 95fcoe: Reorder initialisation for bnx2x
|
|
|
|
References: bsc#982588
|
|
|
|
Signed-off-by: Johannes Thumshirn <jthumshirn@suse.com>
|
|
---
|
|
modules.d/95fcoe/fcoe-up.sh | 22 ++++++++++++----------
|
|
1 file changed, 12 insertions(+), 10 deletions(-)
|
|
|
|
diff --git a/modules.d/95fcoe/fcoe-up.sh b/modules.d/95fcoe/fcoe-up.sh
|
|
index fb3b4c4..a525ade 100755
|
|
--- a/modules.d/95fcoe/fcoe-up.sh
|
|
+++ b/modules.d/95fcoe/fcoe-up.sh
|
|
@@ -45,7 +45,16 @@ write_fcoemon_cfg() {
|
|
echo MODE=\"fabric\" >> /etc/fcoe/cfg-$netif
|
|
}
|
|
|
|
-if [ "$dcb" = "dcb" ]; then
|
|
+if [ "$netdriver" = "bnx2x" ]; then
|
|
+ # If driver is bnx2x, do not use /sys/module/fcoe/parameters/create but fipvlan
|
|
+ modprobe 8021q
|
|
+ udevadm settle --timeout=30
|
|
+ # Sleep for 3 s to allow dcb negotiation
|
|
+ sleep 3
|
|
+ write_fcoemon_cfg
|
|
+ fcoemon --syslog=yes
|
|
+ fipvlan -c -s "$netif"
|
|
+elif [ "$dcb" = "dcb" ]; then
|
|
# wait for lldpad to be ready
|
|
i=0
|
|
while [ $i -lt 60 ]; do
|
|
@@ -79,18 +88,11 @@ if [ "$dcb" = "dcb" ]; then
|
|
sleep 1
|
|
|
|
write_fcoemon_cfg
|
|
- fcoemon --syslog
|
|
-elif [ "$netdriver" = "bnx2x" ]; then
|
|
- # If driver is bnx2x, do not use /sys/module/fcoe/parameters/create but fipvlan
|
|
- modprobe 8021q
|
|
- udevadm settle --timeout=30
|
|
- # Sleep for 3 s to allow dcb negotiation
|
|
- sleep 3
|
|
- fipvlan "$netif" -c -s
|
|
+ fcoemon --syslog=yes
|
|
else
|
|
vlan="no"
|
|
write_fcoemon_cfg
|
|
- fcoemon --syslog
|
|
+ fcoemon --syslog=yes
|
|
fi
|
|
|
|
need_shutdown
|
|
--
|
|
2.6.6
|
|
|