Dominique Leuenberger
aae67ad4f9
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/dracut?expand=0&rev=139
46 lines
1.6 KiB
Diff
46 lines
1.6 KiB
Diff
From 581b48e2e171f1afb01b89a9a4089400d9b20829 Mon Sep 17 00:00:00 2001
|
|
From: Hannes Reinecke <hare@suse.de>
|
|
Date: Tue, 16 Aug 2016 13:26:07 +0200
|
|
Subject: [PATCH] 95fcoe: Do not overwrite FCoE configuration
|
|
|
|
If the installation already has a FCoE configuration we should
|
|
not attempt to overwrite it but rather use the pre-defined
|
|
configuration.
|
|
|
|
References: bsc#993861
|
|
|
|
Signed-off-by: Hannes Reinecke <hare@suse.com>
|
|
---
|
|
modules.d/95fcoe/fcoe-up.sh | 1 +
|
|
modules.d/95fcoe/module-setup.sh | 2 ++
|
|
2 files changed, 3 insertions(+)
|
|
|
|
diff --git a/modules.d/95fcoe/fcoe-up.sh b/modules.d/95fcoe/fcoe-up.sh
|
|
index a525ade..662b21a 100755
|
|
--- a/modules.d/95fcoe/fcoe-up.sh
|
|
+++ b/modules.d/95fcoe/fcoe-up.sh
|
|
@@ -31,6 +31,7 @@ netdriver=$(readlink -f /sys/class/net/$netif/device/driver)
|
|
netdriver=${netdriver##*/}
|
|
|
|
write_fcoemon_cfg() {
|
|
+ [ -f /etc/fcoe/cfg-$netif ] && return
|
|
echo FCOE_ENABLE=\"yes\" > /etc/fcoe/cfg-$netif
|
|
if [ "$dcb" = "dcb" ]; then
|
|
echo DCB_REQUIRED=\"yes\" >> /etc/fcoe/cfg-$netif
|
|
diff --git a/modules.d/95fcoe/module-setup.sh b/modules.d/95fcoe/module-setup.sh
|
|
index 059bfde..a78516d 100755
|
|
--- a/modules.d/95fcoe/module-setup.sh
|
|
+++ b/modules.d/95fcoe/module-setup.sh
|
|
@@ -77,6 +77,8 @@ install() {
|
|
local _fcoeconf=$(cmdline)
|
|
[[ $_fcoeconf ]] && printf "%s\n" "$_fcoeconf" >> "${initdir}/etc/cmdline.d/95fcoe.conf"
|
|
fi
|
|
+ inst_multiple /etc/fcoe/cfg-*
|
|
+
|
|
inst "$moddir/fcoe-up.sh" "/sbin/fcoe-up"
|
|
inst "$moddir/fcoe-edd.sh" "/sbin/fcoe-edd"
|
|
inst "$moddir/fcoe-genrules.sh" "/sbin/fcoe-genrules.sh"
|
|
--
|
|
2.6.6
|
|
|