From 4d8db0c1205283f0855dacbb577cb47c9abd9396 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Wed, 9 Jun 2010 14:57:55 -0700 Subject: Fix syntax checks for mirror/redirect The expansion script doesn't handle --skip=$IFNAME correctly --- interface-templates/mirror/node.def | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'interface-templates/mirror/node.def') diff --git a/interface-templates/mirror/node.def b/interface-templates/mirror/node.def index f19ae06..65246e9 100644 --- a/interface-templates/mirror/node.def +++ b/interface-templates/mirror/node.def @@ -1,11 +1,11 @@ type: txt help: Set incoming packet mirroring destination -allowed: ${vyatta_sbindir}/vyatta-interfaces.pl --skip=$IFNAME --show=all +allowed: ${vyatta_sbindir}/vyatta-interfaces.pl --show=ethernet -syntax: $VAR(@) != $VAR(../@) ;\ +syntax:expression: $VAR(@) != $VAR(../@) ;\ "interface $VAR(../@): mirroring to same interface not allowed" -syntax: /opt/vyatta/sbin/vyatta-interfaces.pl --dev=$IFNAME --check=all +syntax:expression: exec "/opt/vyatta/sbin/vyatta-interfaces.pl --dev $VAR(@) --check=all" commit:expression: $VAR(../redirect) == ""; \ "interface $VAR(../@) : can not redirect and mirror on $IFNAME" -- cgit v1.2.3