Blame 0060-95fcoe-update-fcoe-interface-check.patch
|
Harald Hoyer |
b94732 |
From c64a94caa98749ceb4fad3c551d8e389f508d6df Mon Sep 17 00:00:00 2001
|
|
Harald Hoyer |
b94732 |
From: Hannes Reinecke <hare@suse.de>
|
|
Harald Hoyer |
b94732 |
Date: Thu, 11 Dec 2014 15:46:21 +0100
|
|
Harald Hoyer |
b94732 |
Subject: [PATCH] 95fcoe: update fcoe interface check
|
|
Harald Hoyer |
b94732 |
|
|
Harald Hoyer |
b94732 |
The 'create' sysfs entry has been removed for newer fcoe modules,
|
|
Harald Hoyer |
b94732 |
so just check if the module directory exists.
|
|
Harald Hoyer |
b94732 |
|
|
Harald Hoyer |
b94732 |
References: bnc#877288
|
|
Harald Hoyer |
b94732 |
|
|
Harald Hoyer |
b94732 |
Signed-off-by: Hannes Reinecke <hare@suse.de>
|
|
Harald Hoyer |
b94732 |
Signed-off-by: Thomas Renninger <trenn@suse.de>
|
|
Harald Hoyer |
b94732 |
---
|
|
Harald Hoyer |
b94732 |
modules.d/95fcoe/parse-fcoe.sh | 5 +----
|
|
Harald Hoyer |
b94732 |
1 file changed, 1 insertion(+), 4 deletions(-)
|
|
Harald Hoyer |
b94732 |
|
|
Harald Hoyer |
b94732 |
diff --git a/modules.d/95fcoe/parse-fcoe.sh b/modules.d/95fcoe/parse-fcoe.sh
|
|
Harald Hoyer |
b94732 |
index 59de56f..9604503 100755
|
|
Harald Hoyer |
b94732 |
--- a/modules.d/95fcoe/parse-fcoe.sh
|
|
Harald Hoyer |
b94732 |
+++ b/modules.d/95fcoe/parse-fcoe.sh
|
|
Harald Hoyer |
b94732 |
@@ -20,14 +20,11 @@
|
|
Harald Hoyer |
b94732 |
|
|
Harald Hoyer |
b94732 |
|
|
Harald Hoyer |
b94732 |
# BRCM: Later, should check whether bnx2x is loaded first before loading bnx2fc so do not load bnx2fc when there are no Broadcom adapters
|
|
Harald Hoyer |
b94732 |
-[ -e /sys/module/fcoe/parameters/create ] || modprobe -a fcoe || die "FCoE requested but kernel/initrd does not support FCoE"
|
|
Harald Hoyer |
b94732 |
+[ -d /sys/module/fcoe ] || modprobe -a fcoe || die "FCoE requested but kernel/initrd does not support FCoE"
|
|
Harald Hoyer |
b94732 |
|
|
Harald Hoyer |
b94732 |
modprobe bnx2fc >/dev/null 2>&1
|
|
Harald Hoyer |
b94732 |
udevadm settle --timeout=30
|
|
Harald Hoyer |
b94732 |
|
|
Harald Hoyer |
b94732 |
-# FCoE actually supported?
|
|
Harald Hoyer |
b94732 |
-[ -e /sys/module/fcoe/parameters/create ] || modprobe fcoe || die "FCoE requested but kernel/initrd does not support FCoE"
|
|
Harald Hoyer |
b94732 |
-
|
|
Harald Hoyer |
b94732 |
parse_fcoe_opts() {
|
|
Harald Hoyer |
b94732 |
local IFS=:
|
|
Harald Hoyer |
b94732 |
set $fcoe
|