From 77e04ec08bc73ebcdc2206ebe07b58d909d9df24 Mon Sep 17 00:00:00 2001 From: Sukru Senli Date: Tue, 2 Jan 2018 18:19:43 +0100 Subject: [PATCH] port-management: adapt to new output format of ethctl media-type call --- port-management/files/etc/init.d/port_management | 10 +++++----- port-management/files/etc/init.d/sfp_management | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/port-management/files/etc/init.d/port_management b/port-management/files/etc/init.d/port_management index 811ed6ced..8968293eb 100755 --- a/port-management/files/etc/init.d/port_management +++ b/port-management/files/etc/init.d/port_management @@ -49,15 +49,15 @@ get_current_status() { local port="$1" local flag="$2" local media="$(ethctl $port media-type $flag 2>&1)" - if echo $media | grep "Auto-negotiation enabled" >/dev/null; then + if echo $media | grep "Auto-Negotiation enabled" >/dev/null; then echo "auto" - elif echo $media | grep "100 mbps, full-duplex" >/dev/null; then + elif echo $media | grep "100M, duplex: FD" >/dev/null; then echo "100FD" - elif echo $media | grep "100 mbps, half-duplex" >/dev/null; then + elif echo $media | grep "100M, duplex: HD" >/dev/null; then echo "100HD" - elif echo $media | grep "10 mbps, full-duplex" >/dev/null; then + elif echo $media | grep "10M, duplex: FD" >/dev/null; then echo "10FD" - elif echo $media | grep "10 mbps, half-duplex" >/dev/null; then + elif echo $media | grep "10M, duplex: HD" >/dev/null; then echo "10HD" fi } diff --git a/port-management/files/etc/init.d/sfp_management b/port-management/files/etc/init.d/sfp_management index d8eac450b..4b961f8be 100755 --- a/port-management/files/etc/init.d/sfp_management +++ b/port-management/files/etc/init.d/sfp_management @@ -10,15 +10,15 @@ get_current_status() { local port="$1" local flag="$2" local media="$(ethctl $port media-type $flag 2>&1)" - if echo $media | grep "Auto-negotiation enabled" >/dev/null; then + if echo $media | grep "Auto-Negotiation enabled" >/dev/null; then echo "auto" - elif echo $media | grep "100 mbps, full-duplex" >/dev/null; then + elif echo $media | grep "100M, duplex: FD" >/dev/null; then echo "100FD" - elif echo $media | grep "100 mbps, half-duplex" >/dev/null; then + elif echo $media | grep "100M, duplex: HD" >/dev/null; then echo "100HD" - elif echo $media | grep "10 mbps, full-duplex" >/dev/null; then + elif echo $media | grep "10M, duplex: FD" >/dev/null; then echo "10FD" - elif echo $media | grep "10 mbps, half-duplex" >/dev/null; then + elif echo $media | grep "10M, duplex: HD" >/dev/null; then echo "10HD" fi }