Marcus Meissner
0f203926a1
- Rename patch:
* From 0211-fix_multipath_check_hostonly.patch
to 0303-fix_multipath_check_hostonly.patch
- Rename patch:
* From 0213-10i18n-keymap-find.patch
to 0213-Fix-wrong-keymap-inclusion.patch
- 95fcoe: Do not complain about missing /etc/hba.conf (bsc#980539)
* Add 0215-95fcoe-Do-not-complain-about-missing-etc-hba.conf.patch
- 95fcoe: silence lldpad warnings
* Add 0216-95fcoe-silence-lldpad-warnings.patch
- 95fcoe: Allow to specify the FCoE mode via the fcoe= parameter
* Add 0217-95fcoe-Allow-to-specify-the-FCoE-mode-via-the-fcoe-p.patch
- 40network: allow persistent interface names (bsc#995284)
* Add 0218-40network-allow-persistent-interface-names.patch
- 95fcoe: use interface names instead of MAC addresses
* Add 0219-95fcoe-use-interface-names-instead-of-MAC-addresses.patch
- 95fcoe: always set AUTO_VLAN for fcoemon (bsc#995019)
* Add 0220-95fcoe-always-set-AUTO_VLAN-for-fcoemon.patch
- 95fcoe: Add shutdown script (bsc#994860)
* Add 0221-95fcoe-Add-shutdown-script.patch
- 90dm: Fixup shutdown script (bsc#994860)
* Add 0222-90dm-Fixup-shutdown-script.patch
- 90dm: fixup dependency cycle between MD and DM shutdown (bsc#994860)
* Add 0223-90dm-fixup-dependency-cycle-between-MD-and-DM-shutdo.patch
- 90multipath: Start daemon after udev settle (bsc#986734)
* Add 0304-90multipath-Start-daemon-after-udev-settle.patch
- 90multipath: load dm_multipath module during startup
* Add 0305-90multipath-load-dm_multipath-module-during-startup.patch
- 90multipath: add shutdown script (bsc#994860)
OBS-URL: https://build.opensuse.org/request/show/422869
OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=263
89 lines
2.7 KiB
Diff
89 lines
2.7 KiB
Diff
From 4f19de16df2746b0b742bfbecfb493728a150c86 Mon Sep 17 00:00:00 2001
|
|
From: Hannes Reinecke <hare@suse.de>
|
|
Date: Wed, 24 Aug 2016 15:14:31 +0200
|
|
Subject: [PATCH] 95fcoe: use interface names instead of MAC addresses
|
|
|
|
Now that we are using persistent network names we can switch
|
|
to using the interface names when specifying the fcoe configuration.
|
|
With that we can print the fcoe configuration only once.
|
|
|
|
Signed-off-by: Hannes Reinecke <hare@suse.com>
|
|
---
|
|
modules.d/95fcoe/module-setup.sh | 60 +++++++++++++++++++++-------------------
|
|
1 file changed, 32 insertions(+), 28 deletions(-)
|
|
|
|
diff --git a/modules.d/95fcoe/module-setup.sh b/modules.d/95fcoe/module-setup.sh
|
|
index 2a5c71a..acc611d 100755
|
|
--- a/modules.d/95fcoe/module-setup.sh
|
|
+++ b/modules.d/95fcoe/module-setup.sh
|
|
@@ -40,34 +40,38 @@ get_vlan_parent() {
|
|
|
|
# called by dracut
|
|
cmdline() {
|
|
-
|
|
- for c in /sys/bus/fcoe/devices/ctlr_* ; do
|
|
- [ -L $c ] || continue
|
|
- read enabled < $c/enabled
|
|
- read mode < $c/mode
|
|
- [ $enabled -eq 0 ] && continue
|
|
- if [ $mode = "VN2VN" ] ; then
|
|
- mode="vn2vn"
|
|
- else
|
|
- mode="fabric"
|
|
- fi
|
|
- d=$(cd -P $c; echo $PWD)
|
|
- i=${d%/*}
|
|
- read mac < ${i}/address
|
|
- s=$(dcbtool gc ${i##*/} dcb 2>/dev/null | sed -n 's/^DCB State:\t*\(.*\)/\1/p')
|
|
- if [ -z "$s" ] ; then
|
|
- p=$(get_vlan_parent ${i})
|
|
- if [ "$p" ] ; then
|
|
- s=$(dcbtool gc ${p} dcb 2>/dev/null | sed -n 's/^DCB State:\t*\(.*\)/\1/p')
|
|
- fi
|
|
- fi
|
|
- if [ "$s" = "on" ] ; then
|
|
- dcb="dcb"
|
|
- else
|
|
- dcb="nodcb"
|
|
- fi
|
|
- echo "fcoe=${mac}:${dcb}:${mode}"
|
|
- done
|
|
+ {
|
|
+ for c in /sys/bus/fcoe/devices/ctlr_* ; do
|
|
+ [ -L $c ] || continue
|
|
+ read enabled < $c/enabled
|
|
+ read mode < $c/mode
|
|
+ [ $enabled -eq 0 ] && continue
|
|
+ if [ $mode = "VN2VN" ] ; then
|
|
+ mode="vn2vn"
|
|
+ else
|
|
+ mode="fabric"
|
|
+ fi
|
|
+ d=$(cd -P $c; echo $PWD)
|
|
+ i=${d%/*}
|
|
+ ifname=${i##*/}
|
|
+ read mac < ${i}/address
|
|
+ s=$(dcbtool gc ${i##*/} dcb 2>/dev/null | sed -n 's/^DCB State:\t*\(.*\)/\1/p')
|
|
+ if [ -z "$s" ] ; then
|
|
+ p=$(get_vlan_parent ${i})
|
|
+ if [ "$p" ] ; then
|
|
+ s=$(dcbtool gc ${p} dcb 2>/dev/null | sed -n 's/^DCB State:\t*\(.*\)/\1/p')
|
|
+ ifname=${p##*/}
|
|
+ fi
|
|
+ fi
|
|
+ if [ "$s" = "on" ] ; then
|
|
+ dcb="dcb"
|
|
+ else
|
|
+ dcb="nodcb"
|
|
+ fi
|
|
+ echo "ifname=${ifname}:${mac}"
|
|
+ echo "fcoe=${ifname}:${dcb}:${mode}"
|
|
+ done
|
|
+ } | sort | uniq
|
|
}
|
|
|
|
# called by dracut
|
|
--
|
|
2.6.6
|
|
|