From a33ae25d0bc965a6dbda9b9ec1da351cfcc29a17 Mon Sep 17 00:00:00 2001 From: David Bell Date: Tue, 31 Jan 2017 22:19:17 +0000 Subject: [PATCH] fix: ifAlias script now works with snmpbulkwalk #5547 --- scripts/ifAlias | 73 ++++++++++++++++++++----------------------------- 1 file changed, 29 insertions(+), 44 deletions(-) diff --git a/scripts/ifAlias b/scripts/ifAlias index 30574743a5..f53d74dbfc 100755 --- a/scripts/ifAlias +++ b/scripts/ifAlias @@ -18,56 +18,41 @@ ID=$(cut -d . -f 13 <<< $2) cache=$(ip l) if [ -z "$ID" ]; then - ID=0 -fi - -if [ "$1" = "-n" ]; then - IFS=" -" - for dev in $(grep mtu <<<"$cache" | cut -d : -f 1|sort -n); do - if [ "$LAST" == "$ID" ]; then - ID=$dev - BRK=1 - break - else - LAST=$dev - fi - done - if [ -z "$BRK" ]; then - exit 0 - fi + ID=1 +else + ID=$(($ID+1)) fi IFACE=$(grep "^${ID}: " <<<"$cache" | sed 's/[:@]\s/ /g'| cut -d " " -f 2 | cut -d @ -f 1) echo ${BASE}.${ID} if [ "X${IFACE}" = "X" ]; then - echo noSuchName + echo noSuchName else - echo "string" - if [ -x /usr/bin/distro ]; then - case $(distro | cut -d " " -f 1) in - Debian) - cnf="/etc/network/interfaces" - ;; - Gentoo) - cnf="/etc/conf.d/net" - ;; - CentOS|RedHat|SuSE|Mandriva|Mandrake) - cnf="/etc/sysconfig/network-scripts/ifcfg-$IFACE" - ;; - Archlinux) - cnf="/etc/conf.d/net-conf-$IFACE" - ;; - *) - cnf="" - ;; - esac - fi - if [ -n "$cnf" ]; then - echo $(grep -i "^# $IFACE:" $cnf | sed "s/^# $IFACE: //i") - else - echo - fi + echo "string" + if [ -x /usr/bin/distro ]; then + case $(distro | cut -d " " -f 1) in + Debian) + cnf="/etc/network/interfaces" + ;; + Gentoo) + cnf="/etc/conf.d/net" + ;; + CentOS|RedHat|SuSE|Mandriva|Mandrake) + cnf="/etc/sysconfig/network-scripts/ifcfg-$IFACE" + ;; + Archlinux) + cnf="/etc/conf.d/net-conf-$IFACE" + ;; + *) + cnf="" + ;; + esac + fi + if [ -n "$cnf" ]; then + echo $(grep -i "^# $IFACE:" $cnf | sed "s/^# $IFACE: //i") + else + echo + fi fi exit 0