95fcoe: Switch back to using fipvlan for bnx2fc

bnx2fc doesn't _actually_ need fcoemon, so fipvlan is sufficient
to start the FCoE connection.
And, in fact, fcoemon is started for every interface, causing
subsequent invocations to fail with

fcoemon[1157]: error 98 address already in use

and fcoemon tearing down the connection.

References: bsc#1052840

Signed-off-by: Hannes Reinecke <hare@suse.com>

diff --git a/modules.d/95fcoe/fcoe-up.sh b/modules.d/95fcoe/fcoe-up.sh
index c2da0be21ab4615c562b522c191df32998af1187..570cd848d2081feeff6381ee6a8f7ff6cd45c599 100755 (executable)
--- a/modules.d/95fcoe/fcoe-up.sh
+++ b/modules.d/95fcoe/fcoe-up.sh
@@ -64,10 +64,11 @@ if [ "$netdriver" = "bnx2x" ]; then
     udevadm settle --timeout=30
     # Sleep for 13 s to allow dcb negotiation
     sleep 13
-    write_fcoemon_cfg
-    fcoemon $syslogopt
-    fipvlan -c -s "$netif"
-elif [ "$dcb" = "dcb" ]; then
+    fipvlan "$netif" -c -s
+    need_shutdown
+    exit
+fi
+if [ "$dcb" = "dcb" ]; then
     # wait for lldpad to be ready
     i=0
     while [ $i -lt 60 ]; do