From 92b56210508f31ea278652d5d3fdf6c893ef6485 Mon Sep 17 00:00:00 2001
From: Stig Thormodsrud <stig@vyatta.com>
Date: Tue, 15 Jan 2008 14:45:00 -0800
Subject: Filter out vlans from "show interfaces ethernet" help string.

---
 templates/interfaces/ethernet/node.def | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'templates')

diff --git a/templates/interfaces/ethernet/node.def b/templates/interfaces/ethernet/node.def
index 66a5344..f3b4cac 100644
--- a/templates/interfaces/ethernet/node.def
+++ b/templates/interfaces/ethernet/node.def
@@ -2,12 +2,12 @@ tag:
 type: txt
 help: "Ethernet interface name"
 syntax: exec " \
-        if [ -z \"`ip addr | grep $(@) `\" ]; then \
-          echo ethernet interface $(@) doesn\\'t exist on this system ; \
+        if [ -z \"`ip link | egrep -v 'eth[0-9]+[.]' | grep $(@)`\" ]; then \
+          echo Invalid ethernet interface [$(@)]; \
           exit 1 ; \
         fi ; "
 update: "sudo ip link set $(@) up" ; "Error enabling dev $(@)"
 delete: "sudo ip link set $(@) down" ; "Error disabling dev $(@)"
 #allowed: local -a array ;
-# array=( /sys/class/net/{eth,vmnet}* ) ;
+# array=( /sys/class/net/{eth,vmnet}[0-9]+[^.] ) ;
 # echo -n ${array[@]##*/}
-- 
cgit v1.2.3