diff options
| author | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2010-06-09 14:57:55 -0700 |
|---|---|---|
| committer | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2010-06-09 16:02:18 -0700 |
| commit | 4d8db0c1205283f0855dacbb577cb47c9abd9396 (patch) | |
| tree | a4303a1b643c486776e425b21fc7bb503e4c6712 /interface-templates | |
| parent | c8fe2f19103b6e7322bf23c3b0ece49db2a1efc1 (diff) | |
| download | vyatta-cfg-qos-4d8db0c1205283f0855dacbb577cb47c9abd9396.tar.gz vyatta-cfg-qos-4d8db0c1205283f0855dacbb577cb47c9abd9396.zip | |
Fix syntax checks for mirror/redirect
The expansion script doesn't handle --skip=$IFNAME correctly
Diffstat (limited to 'interface-templates')
| -rw-r--r-- | interface-templates/mirror/node.def | 6 | ||||
| -rw-r--r-- | interface-templates/redirect/node.def | 6 |
2 files changed, 6 insertions, 6 deletions
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" diff --git a/interface-templates/redirect/node.def b/interface-templates/redirect/node.def index e94e8a8..49dd6e1 100644 --- a/interface-templates/redirect/node.def +++ b/interface-templates/redirect/node.def @@ -1,11 +1,11 @@ type: txt help: Set incoming packet redirection destination -allowed: /opt/vyatta/sbin/vyatta-interfaces.pl --skip=$IFNAME --show=all +allowed: /opt/vyatta/sbin/vyatta-interfaces.pl --show=input -syntax: $VAR(@) != $VAR(../@) ;\ +syntax:expression: $VAR(@) != $VAR(../@) ;\ "interface $VAR(../@): redirect 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(../mirror) == "";\ "interface $VAR(../@) : can not redirect and mirror on $IFNAME" |