diff options
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/protocols/ospf/area/node.tag/network/node.def | 11 | ||||
| -rw-r--r-- | templates/protocols/ospf/passive-interface/node.def | 6 |
2 files changed, 4 insertions, 13 deletions
diff --git a/templates/protocols/ospf/area/node.tag/network/node.def b/templates/protocols/ospf/area/node.tag/network/node.def index 17648610..6f8e69d6 100644 --- a/templates/protocols/ospf/area/node.tag/network/node.def +++ b/templates/protocols/ospf/area/node.tag/network/node.def @@ -1,11 +1,8 @@ multi: type: ipv4net help: Set OSPF network -priority: 1 syntax:expression: exec "${vyatta_sbindir}/check_prefix_boundary $VAR(@)" -create:expression: "vyatta-vtysh -c \"configure terminal\" \ - -c \"router ospf\" \ - -c \"network $VAR(@) area $VAR(../@)\"; " -delete:expression: "vyatta-vtysh -c \"configure terminal\" \ - -c \"router ospf\" \ - -c \"no network $VAR(@) area $VAR(../@)\"; " +update:vyatta-vtysh -c "configure terminal" \ + -c "router ospf" -c "network $VAR(@) area $VAR(../@)" +delete:vyatta-vtysh -c "configure terminal" \ + -c "router ospf" -c "no network $VAR(@) area $VAR(../@)" diff --git a/templates/protocols/ospf/passive-interface/node.def b/templates/protocols/ospf/passive-interface/node.def index d82edd03..b469f1c7 100644 --- a/templates/protocols/ospf/passive-interface/node.def +++ b/templates/protocols/ospf/passive-interface/node.def @@ -1,12 +1,6 @@ multi: type: txt help: Set to suppress routing updates on an interface - -commit:expression: exec "${vyatta_sbindir}/vyatta-interfaces.pl \ - --check all --dev $VAR(@) 2> /dev/null || \ - [ x$VAR(@) == xdefault ]"; \ - "$VAR(@) is not 'default' or a known interface name" - allowed: ${vyatta_sbindir}/vyatta-interfaces.pl --show all && echo default update: if [ -z $VAR(@) ] then vyatta-vtysh -c "configure terminal" -c "router ospf" \ |