2e0abbdaf2
- FCOE fix bsc#982588 * Add 0212-fcoe_reorder_init_path.patch - Port missing SLES patches * Add 0197-95iscsi-Do-not-require-network-for-qla4xxx-flash-ses.patch * Add 0198-95iscsi-set-rd.iscsi.firmware-for-qla4xxx-sessions.patch * Remove 0194-95iscsi-Do-not-require-network-for-qla4xxx-flash-ses.patch * Remove 0195-95iscsi-set-rd.iscsi.firmware-for-qla4xxx-sessions.patch - Rewrite patch: * Add 0302-Revert-90multipath-add-hostonly-multipath.conf-in-ca.patch * Remove 0001-multipath_revert_mpathconf_binary_use.patch - Update 0403-95lunmask-Add-module-to-handle-LUN-masking.patch to match upstream kernel submission (FATE#319786) - Add IFS restoring where it has been lost due to mainline merging (bsc#977117) *Add 0500-Reset-IFS-variable.patch - Make sure to install collect binary (bsc#976466) * Add: 0188-95dasd_rules-Install-collect-udev-helper-binary.patch - Remove version from requires on subpackage - Add a split provide because of the package split for SLE12 SP1 to SP2 upgrade * 0001-multipath_revert_mpathconf_binary_use.patch (fate#320499) * 0170-iscsi-skip-ibft-invalid-dhcp.patch (bsc#953361) * 0160-s390-update_active_devices_initrd.patch (bsc#939101) * 0161-95zfcp_rules-simplified-rd.zfcp-commandline-for-NPIV.patch (bsc#964456) * 0190-replace-iscsistart-with-systemd-service-files.patch (fate#319024) * 0191-static_network_setup_return_zero.patch (bsc#919179) OBS-URL: https://build.opensuse.org/request/show/400457 OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=258
45 lines
1.2 KiB
Diff
45 lines
1.2 KiB
Diff
From: Johannes Thumshirn <jthumshirn@suse.com>
|
|
References: bsc#982588
|
|
|
|
--- 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
|