36 lines
1.3 KiB
Diff
36 lines
1.3 KiB
Diff
|
From 4d9ec023b6c4a20cc7ffc6ea4ccf86b008a3cbcf Mon Sep 17 00:00:00 2001
|
||
|
|
From: Hannes Reinecke <hare@suse.de>
|
||
|
|
Date: Tue, 23 Aug 2016 14:35:04 +0200
|
||
|
|
Subject: [PATCH] 95fcoe: silence lldpad warnings
|
||
|
|
|
||
|
|
When lldpad is not running, any calls to 'dcbtool' will be printing
|
||
|
|
out a warning. As it perfectly legit to have FCoE running without
|
||
|
|
DCB we should not be printing out the error.
|
||
|
|
|
||
|
|
Signed-off-by: Hannes Reinecke <hare@suse.com>
|
||
|
|
---
|
||
|
|
modules.d/95fcoe/module-setup.sh | 4 ++--
|
||
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/modules.d/95fcoe/module-setup.sh b/modules.d/95fcoe/module-setup.sh
|
||
|
|
index d08e917..18c00b3 100755
|
||
|
|
--- a/modules.d/95fcoe/module-setup.sh
|
||
|
|
+++ b/modules.d/95fcoe/module-setup.sh
|
||
|
|
@@ -48,11 +48,11 @@ cmdline() {
|
||
|
|
d=$(cd -P $c; echo $PWD)
|
||
|
|
i=${d%/*}
|
||
|
|
read mac < ${i}/address
|
||
|
|
- s=$(dcbtool gc ${i##*/} dcb | sed -n 's/^DCB State:\t*\(.*\)/\1/p')
|
||
|
|
+ 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 | sed -n 's/^DCB State:\t*\(.*\)/\1/p')
|
||
|
|
+ s=$(dcbtool gc ${p} dcb 2>/dev/null | sed -n 's/^DCB State:\t*\(.*\)/\1/p')
|
||
|
|
fi
|
||
|
|
fi
|
||
|
|
if [ "$s" = "on" ] ; then
|
||
|
|
--
|
||
|
|
2.6.6
|
||
|
|
|