From dadc594e08c41b6bc912d7348b8e762c25b8d2c4 Mon Sep 17 00:00:00 2001 From: Runar Borge Date: Fri, 5 Jul 2019 21:36:16 +0200 Subject: T1499: Allow for usage of systemd interface mappings --- scripts/vyatta-identify-interface.pl | 2 +- scripts/vyatta-show-interfaces | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'scripts') diff --git a/scripts/vyatta-identify-interface.pl b/scripts/vyatta-identify-interface.pl index 1cfdb36..a116963 100755 --- a/scripts/vyatta-identify-interface.pl +++ b/scripts/vyatta-identify-interface.pl @@ -26,7 +26,7 @@ use strict; my $intf = shift; -if (!($intf =~ /^eth\d+/)) { +if (!($intf =~ /^(eth\d+|en[ospx])/)) { print STDERR "This command only supports Ethernet interfaces\n"; exit 1; } diff --git a/scripts/vyatta-show-interfaces b/scripts/vyatta-show-interfaces index 1b0a156..262664f 100755 --- a/scripts/vyatta-show-interfaces +++ b/scripts/vyatta-show-interfaces @@ -22,7 +22,7 @@ shopt -s extglob shopt -s nullglob declare progname=${0##*/} -declare -a full_itfs=( /sys/class/net/+(eth|vmnet|lo|tun|wan|pppoe|pppoa|adsl)* ) +declare -a full_itfs=( /sys/class/net/+(eno|ens|enp|enx|eth|vmnet|lo|tun|wan|pppoe|pppoa|adsl)* ) declare -a itfs declare _do_show=_show_itf_stats @@ -128,7 +128,7 @@ _usage () _add_itfs () { for itf ; do - if [[ $itf != +(eth|vmnet|lo|tun|wan|pppoe|pppoa|adsl)* ]] ; then + if [[ $itf != +(eno|ens|enp|enx|eth|vmnet|lo|tun|wan|pppoe|pppoa|adsl)* ]] ; then _error 2 \""$itf"\" is not an interface name\! elif [ ! -d /sys/class/net/$itf ] ; then _error 2 $itf: no such interface\! @@ -146,7 +146,7 @@ if [ $# -gt 0 ] ; then if [ $# -eq 1 ] ; then case $1 in ethernet ) - full_itfs=( /sys/class/net/+(eth|vmnet)* ) ;; + full_itfs=( /sys/class/net/+(eno|ens|enp|enx|eth|vmnet)* ) ;; loopback ) full_itfs=( /sys/class/net/lo* ) ;; tunnel ) -- cgit v1.2.3