From a9e83d88376ff508f1ae77e7c574bff4c9626a6c Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Tue, 3 Mar 2009 08:54:21 -0800 Subject: Use vyatta-interfaces.pl to check bridge validity --- .../interfaces/ethernet/node.tag/bridge-group/bridge/node.def | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'templates') diff --git a/templates/interfaces/ethernet/node.tag/bridge-group/bridge/node.def b/templates/interfaces/ethernet/node.tag/bridge-group/bridge/node.def index 79609a86..1a6cf437 100644 --- a/templates/interfaces/ethernet/node.tag/bridge-group/bridge/node.def +++ b/templates/interfaces/ethernet/node.tag/bridge-group/bridge/node.def @@ -1,11 +1,6 @@ type: txt help: Set this interface to a bridge-group -syntax:expression: exec " \ - if [ -z \"`sudo brctl show | grep $VAR(@) `\" ]; then \ - echo bridge interface $VAR(@) doesn\\'t exist on this system ; \ - exit 1 ; \ - fi ; " +syntax:expression: exec \ + "/opt/vyatta/sbin/vyatta-interfaces.pl --dev=$VAR(@) --check=bridge" +allowed: /opt/vyatta/sbin/vyatta-interfaces.pl --show=bridge delete: echo $VAR(@) > /tmp/bridge-no.$PPID -allowed: local -a array ; - array=( /sys/class/net/br* ) ; - echo -n ${array[@]##*/} -- cgit v1.2.3