diff options
56 files changed, 399 insertions, 104 deletions
diff --git a/debian/changelog b/debian/changelog index 6ac27062..bd746609 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,35 @@ +vyatta-cfg-quagga (0.17.5) unstable; urgency=low + + * Fix call to vyatta-interfaces.pl --check now requires --dev + + -- Stig Thormodsrud <stig@io.vyatta.com> Thu, 05 Mar 2009 15:07:48 -0800 + +vyatta-cfg-quagga (0.17.4) unstable; urgency=low + + [ slioch ] + * clean up other static route commands to remove references to /tmp/ + pellets and to use environment variable set via new cli. + + [ Stig Thormodsrud ] + * Fix 4184: ospfv3 interface values don't work on vlans + * Fix 'passive-interface' to allow interface or 'default'. + + -- Stig Thormodsrud <stig@io.vyatta.com> Thu, 05 Mar 2009 10:48:20 -0800 + +vyatta-cfg-quagga (0.17.3) unstable; urgency=low + + [ Stig Thormodsrud ] + * Add initial "interface <> ipv6 ripng" nodes. + * Minor cleanups to "interface <> ipv6 ospfv3" before copying to other + interfaces. + + [ slioch ] + * ported example of node.def using commit environmental variable + rather than relying on /tmp pellets. should also improve performance + when delete large numbers of static + + -- slioch <slioch@eng-140.vyatta.com> Wed, 04 Mar 2009 09:47:28 -0800 + vyatta-cfg-quagga (0.17.2) unstable; urgency=low [ Stig Thormodsrud ] diff --git a/templates/interfaces/bonding/node.tag/ipv6/node.def b/templates/interfaces/bonding/node.tag/ipv6/node.def new file mode 100644 index 00000000..6ad8bff4 --- /dev/null +++ b/templates/interfaces/bonding/node.tag/ipv6/node.def @@ -0,0 +1 @@ +help: Set IPv6 parameters for specified interface diff --git a/templates/interfaces/bonding/node.tag/ipv6/ripng/node.def b/templates/interfaces/bonding/node.tag/ipv6/ripng/node.def new file mode 100644 index 00000000..cb2d89aa --- /dev/null +++ b/templates/interfaces/bonding/node.tag/ipv6/ripng/node.def @@ -0,0 +1 @@ +help: Set Routing Information Protocol (RIPng) for specified interface diff --git a/templates/interfaces/bonding/node.tag/ipv6/ripng/split-horizon/disable/node.def b/templates/interfaces/bonding/node.tag/ipv6/ripng/split-horizon/disable/node.def new file mode 100644 index 00000000..825f24ab --- /dev/null +++ b/templates/interfaces/bonding/node.tag/ipv6/ripng/split-horizon/disable/node.def @@ -0,0 +1,12 @@ +help: Disable split horizon on specified interface +create: vyatta-vtysh \ + -c "configure terminal" \ + -c "interface $VAR(../../../../@)" \ + -c "no ipv6 ripng split-horizon" + +delete: vyatta-vtysh \ + -c "configure terminal" \ + -c "interface $VAR(../../../../@)" \ + -c "ipv6 ripng split-horizon" + +commit:expression: ($VAR(../poison-reverse/) == ""); "You cannot have 'split-horizon poison-reverse' enabled with 'split-horizon' disabled for ethernet interface $VAR(../../../../@)" diff --git a/templates/interfaces/bonding/node.tag/ipv6/ripng/split-horizon/node.def b/templates/interfaces/bonding/node.tag/ipv6/ripng/split-horizon/node.def new file mode 100644 index 00000000..ba39b616 --- /dev/null +++ b/templates/interfaces/bonding/node.tag/ipv6/ripng/split-horizon/node.def @@ -0,0 +1 @@ +help: Set to control split horizon parameters on this interface diff --git a/templates/interfaces/bonding/node.tag/ipv6/ripng/split-horizon/poison-reverse/node.def b/templates/interfaces/bonding/node.tag/ipv6/ripng/split-horizon/poison-reverse/node.def new file mode 100644 index 00000000..e3b1663b --- /dev/null +++ b/templates/interfaces/bonding/node.tag/ipv6/ripng/split-horizon/poison-reverse/node.def @@ -0,0 +1,13 @@ +help: Enable poison reverse for split-horizon +create: vyatta-vtysh \ + -c "configure terminal" \ + -c "interface $VAR(../../../../@)" \ + -c "ipv6 ripng split-horizon poisoned-reverse" + +delete: vyatta-vtysh \ + -c "configure terminal" \ + -c "interface $VAR(../../../../@)" \ + -c "no ipv6 ripng split-horizon" \ + -c "ipv6 ripng split-horizon" + +commit:expression: ($VAR(../disable/) == ""); "You cannot have 'split-horizon poison-reverse' enabled with 'split-horizon' disabled for ethernet interface $VAR(../../../../@)" diff --git a/templates/interfaces/bridge/node.tag/ipv6/node.def b/templates/interfaces/bridge/node.tag/ipv6/node.def new file mode 100644 index 00000000..6ad8bff4 --- /dev/null +++ b/templates/interfaces/bridge/node.tag/ipv6/node.def @@ -0,0 +1 @@ +help: Set IPv6 parameters for specified interface diff --git a/templates/interfaces/bridge/node.tag/ipv6/ripng/node.def b/templates/interfaces/bridge/node.tag/ipv6/ripng/node.def new file mode 100644 index 00000000..cb2d89aa --- /dev/null +++ b/templates/interfaces/bridge/node.tag/ipv6/ripng/node.def @@ -0,0 +1 @@ +help: Set Routing Information Protocol (RIPng) for specified interface diff --git a/templates/interfaces/bridge/node.tag/ipv6/ripng/split-horizon/disable/node.def b/templates/interfaces/bridge/node.tag/ipv6/ripng/split-horizon/disable/node.def new file mode 100644 index 00000000..825f24ab --- /dev/null +++ b/templates/interfaces/bridge/node.tag/ipv6/ripng/split-horizon/disable/node.def @@ -0,0 +1,12 @@ +help: Disable split horizon on specified interface +create: vyatta-vtysh \ + -c "configure terminal" \ + -c "interface $VAR(../../../../@)" \ + -c "no ipv6 ripng split-horizon" + +delete: vyatta-vtysh \ + -c "configure terminal" \ + -c "interface $VAR(../../../../@)" \ + -c "ipv6 ripng split-horizon" + +commit:expression: ($VAR(../poison-reverse/) == ""); "You cannot have 'split-horizon poison-reverse' enabled with 'split-horizon' disabled for ethernet interface $VAR(../../../../@)" diff --git a/templates/interfaces/bridge/node.tag/ipv6/ripng/split-horizon/node.def b/templates/interfaces/bridge/node.tag/ipv6/ripng/split-horizon/node.def new file mode 100644 index 00000000..ba39b616 --- /dev/null +++ b/templates/interfaces/bridge/node.tag/ipv6/ripng/split-horizon/node.def @@ -0,0 +1 @@ +help: Set to control split horizon parameters on this interface diff --git a/templates/interfaces/bridge/node.tag/ipv6/ripng/split-horizon/poison-reverse/node.def b/templates/interfaces/bridge/node.tag/ipv6/ripng/split-horizon/poison-reverse/node.def new file mode 100644 index 00000000..e3b1663b --- /dev/null +++ b/templates/interfaces/bridge/node.tag/ipv6/ripng/split-horizon/poison-reverse/node.def @@ -0,0 +1,13 @@ +help: Enable poison reverse for split-horizon +create: vyatta-vtysh \ + -c "configure terminal" \ + -c "interface $VAR(../../../../@)" \ + -c "ipv6 ripng split-horizon poisoned-reverse" + +delete: vyatta-vtysh \ + -c "configure terminal" \ + -c "interface $VAR(../../../../@)" \ + -c "no ipv6 ripng split-horizon" \ + -c "ipv6 ripng split-horizon" + +commit:expression: ($VAR(../disable/) == ""); "You cannot have 'split-horizon poison-reverse' enabled with 'split-horizon' disabled for ethernet interface $VAR(../../../../@)" diff --git a/templates/interfaces/ethernet/node.tag/ipv6/ospfv3/cost/node.def b/templates/interfaces/ethernet/node.tag/ipv6/ospfv3/cost/node.def index 2c653c8f..939f5c5e 100644 --- a/templates/interfaces/ethernet/node.tag/ipv6/ospfv3/cost/node.def +++ b/templates/interfaces/ethernet/node.tag/ipv6/ospfv3/cost/node.def @@ -1,8 +1,13 @@ type: u32 help: Set interface cost syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535" -update:expression: "vyatta-vtysh -c \"configure terminal\" \ - -c \"interface $VAR(../../../@)\" \ - -c \"ipv6 ospf6 cost $VAR(@) \"; " +update: vyatta-vtysh \ + -c "configure terminal" \ + -c "interface $VAR(../../../@)" \ + -c "ipv6 ospf6 cost $VAR(@)" +delete: vyatta-vtysh \ + -c "configure terminal" \ + -c "interface $VAR(../../../@)" \ + -c "no ipv6 ospf6 cost" comp_help: possible completions: - <1-65535> Set Cost + <1-65535> Set cost diff --git a/templates/interfaces/ethernet/node.tag/ipv6/ospfv3/dead-interval/node.def b/templates/interfaces/ethernet/node.tag/ipv6/ospfv3/dead-interval/node.def index fcc3be00..f870aec0 100644 --- a/templates/interfaces/ethernet/node.tag/ipv6/ospfv3/dead-interval/node.def +++ b/templates/interfaces/ethernet/node.tag/ipv6/ospfv3/dead-interval/node.def @@ -2,8 +2,13 @@ type: u32 help: Set interval after which a neighbor is declared dead default: 40 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535" -update:expression: "vyatta-vtysh \ - -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \ - -c \"ipv6 ospf6 dead-interval $VAR(@)\"; " +update: vyatta-vtysh \ + -c "configure terminal" \ + -c "interface $VAR(../../../@)" \ + -c "ipv6 ospf6 dead-interval $VAR(@)" +delete: vyatta-vtysh \ + -c "configure terminal" \ + -c "interface $VAR(../../../@)" \ + -c "no ipv6 ospf6 dead-interval" comp_help: possible completions: - <1-65535> Seconds (default 40) + <1-65535> Seconds (default 40) diff --git a/templates/interfaces/ethernet/node.tag/ipv6/ospfv3/hello-interval/node.def b/templates/interfaces/ethernet/node.tag/ipv6/ospfv3/hello-interval/node.def index ae277b4c..c2fa4198 100644 --- a/templates/interfaces/ethernet/node.tag/ipv6/ospfv3/hello-interval/node.def +++ b/templates/interfaces/ethernet/node.tag/ipv6/ospfv3/hello-interval/node.def @@ -2,8 +2,13 @@ type: u32 help: Set interval between hello packets default: 10 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535" -update:expression: "vyatta-vtysh \ - -c \"configure terminal\" -c \"interface $VAR(../../../@) \" \ - -c \"ipv6 ospf6 hello-interval $VAR(@)\"; " +update: vyatta-vtysh \ + -c "configure terminal" \ + -c "interface $VAR(../../../@)" \ + -c "ipv6 ospf6 hello-interval $VAR(@)" +delete: vyatta-vtysh \ + -c "configure terminal" \ + -c "interface $VAR(../../../@)" \ + -c "no ipv6 ospf6 hello-interval" comp_help: possible completions: - <1-65535> Seconds (default 10) + <1-65535> Seconds (default 10) diff --git a/templates/interfaces/ethernet/node.tag/ipv6/ospfv3/ifmtu/node.def b/templates/interfaces/ethernet/node.tag/ipv6/ospfv3/ifmtu/node.def index b6b84a87..12c48bf3 100644 --- a/templates/interfaces/ethernet/node.tag/ipv6/ospfv3/ifmtu/node.def +++ b/templates/interfaces/ethernet/node.tag/ipv6/ospfv3/ifmtu/node.def @@ -1,11 +1,13 @@ type: u32 help: Set interface MTU syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535" -update:expression: "vyatta-vtysh -c \"configure terminal\" \ - -c \"interface $VAR(../../../@)\" \ - -c \"ipv6 ospf6 ifmtu $VAR(@) \"; " -delete:expression: "vyatta-vtysh -c \"configure terminal\" \ - -c \"interface $VAR(../../../@)\" \ - -c \"no ipv6 ospf6 ifmtu \"; " +update: vyatta-vtysh \ + -c "configure terminal" \ + -c "interface $VAR(../../../@)" \ + -c "ipv6 ospf6 ifmtu $VAR(@)" +delete: vyatta-vtysh \ + -c "configure terminal" \ + -c "interface $VAR(../../../@)" \ + -c "no ipv6 ospf6 ifmtu" comp_help: possible completions: - <1-65535> Set Cost + <1-65535> Set interface MTU diff --git a/templates/interfaces/ethernet/node.tag/ipv6/ospfv3/instance-id/node.def b/templates/interfaces/ethernet/node.tag/ipv6/ospfv3/instance-id/node.def index 4df3aea7..89505635 100644 --- a/templates/interfaces/ethernet/node.tag/ipv6/ospfv3/instance-id/node.def +++ b/templates/interfaces/ethernet/node.tag/ipv6/ospfv3/instance-id/node.def @@ -2,8 +2,13 @@ type: u32 help: Set instance-id for this interface default: 0 syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 255; "Must be between 0-255" -update:expression: "vyatta-vtysh \ - -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \ - -c \"ipv6 ospf6 instance-id $VAR(@)\"; " +update: vyatta-vtysh \ + -c "configure terminal" \ + -c "interface $VAR(../../../@)" \ + -c "ipv6 ospf6 instance-id $VAR(@)" +delete: vyatta-vtysh \ + -c "configure terminal" \ + -c "interface $VAR(../../../@)" \ + -c "no ipv6 ospf6 instance-id" comp_help: possible completions: - <0-255> Instance Id (default 0) + <0-255> Instance Id (default 0) diff --git a/templates/interfaces/ethernet/node.tag/ipv6/ospfv3/passive/node.def b/templates/interfaces/ethernet/node.tag/ipv6/ospfv3/passive/node.def index d5a43377..64d79e0c 100644 --- a/templates/interfaces/ethernet/node.tag/ipv6/ospfv3/passive/node.def +++ b/templates/interfaces/ethernet/node.tag/ipv6/ospfv3/passive/node.def @@ -1,7 +1,9 @@ help: Disable forming of adjacency on this interface -create:expression: "vyatta-vtysh - -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \ - -c \"ipv6 ospf6 passive\"; " -delete:expression: "vyatta-vtysh - -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \ - -c \"no ipv6 ospf6 passive\"; " +create: vyatta-vtysh \ + -c "configure terminal" \ + -c "interface $VAR(../../../@)" \ + -c "ipv6 ospf6 passive" +delete: vyatta-vtysh \ + -c "configure terminal" \ + -c "interface $VAR(../../../@)" \ + -c "no ipv6 ospf6 passive" diff --git a/templates/interfaces/ethernet/node.tag/ipv6/ospfv3/priority/node.def b/templates/interfaces/ethernet/node.tag/ipv6/ospfv3/priority/node.def index efd10574..1755a61d 100644 --- a/templates/interfaces/ethernet/node.tag/ipv6/ospfv3/priority/node.def +++ b/templates/interfaces/ethernet/node.tag/ipv6/ospfv3/priority/node.def @@ -2,8 +2,13 @@ type: u32 help: Set router priority default: 1 syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 255; "Must be between 0-255" -update:expression: "vyatta-vtysh \ - -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \ - -c \"ipv6 ospf6 priority $VAR(@)\"; " +update: vyatta-vtysh \ + -c "configure terminal" \ + -c "interface $VAR(../../../@)" \ + -c "ipv6 ospf6 priority $VAR(@)" +delete: vyatta-vtysh \ + -c "configure terminal" \ + -c "interface $VAR(../../../@)" \ + -c "no ipv6 ospf6 priority" comp_help: possible completions: - <0-255> Priority (default 1) + <0-255> Priority (default 1) diff --git a/templates/interfaces/ethernet/node.tag/ipv6/ospfv3/retransmit-interval/node.def b/templates/interfaces/ethernet/node.tag/ipv6/ospfv3/retransmit-interval/node.def index 34651d7a..5ca7b677 100644 --- a/templates/interfaces/ethernet/node.tag/ipv6/ospfv3/retransmit-interval/node.def +++ b/templates/interfaces/ethernet/node.tag/ipv6/ospfv3/retransmit-interval/node.def @@ -2,8 +2,13 @@ type: u32 help: Set interval between retransmitting lost link state advertisements default: 5 syntax:expression: $VAR(@) >= 3 && $VAR(@) <= 65535; "Must be between 3-65535" -update:expression: "vyatta-vtysh \ - -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \ - -c \"ipv6 ospf6 retransmit-interval $VAR(@)\"; " +update: vyatta-vtysh \ + -c "configure terminal" \ + -c "interface $VAR(../../../@)" \ + -c "ipv6 ospf6 retransmit-interval $VAR(@)" +delete: vyatta-vtysh \ + -c "configure terminal" \ + -c "interface $VAR(../../../@)" \ + -c "no ipv6 ospf6 retransmit-interval" comp_help: possible completions: - <3-65535> Seconds (default 5) + <3-65535> Seconds (default 5) diff --git a/templates/interfaces/ethernet/node.tag/ipv6/ospfv3/transmit-delay/node.def b/templates/interfaces/ethernet/node.tag/ipv6/ospfv3/transmit-delay/node.def index 0b623a42..cc3e67ca 100644 --- a/templates/interfaces/ethernet/node.tag/ipv6/ospfv3/transmit-delay/node.def +++ b/templates/interfaces/ethernet/node.tag/ipv6/ospfv3/transmit-delay/node.def @@ -2,8 +2,13 @@ type: u32 help: Set link state transmit delay default: 1 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535" -update:expression: "vyatta-vtysh \ - -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \ - -c \"ipv6 ospf6 transmit-delay $VAR(@)\"; " +update: vyatta-vtysh \ + -c "configure terminal" \ + -c "interface $VAR(../../../@)" \ + -c "ipv6 ospf6 transmit-delay $VAR(@)" +delete: vyatta-vtysh \ + -c "configure terminal" \ + -c "interface $VAR(../../../@)" \ + -c "no ipv6 ospf6 transmit-delay" comp_help: possible completions: - <1-65535> Seconds (default 1) + <1-65535> Seconds (default 1) diff --git a/templates/interfaces/ethernet/node.tag/ipv6/ripng/node.def b/templates/interfaces/ethernet/node.tag/ipv6/ripng/node.def new file mode 100644 index 00000000..cb2d89aa --- /dev/null +++ b/templates/interfaces/ethernet/node.tag/ipv6/ripng/node.def @@ -0,0 +1 @@ +help: Set Routing Information Protocol (RIPng) for specified interface diff --git a/templates/interfaces/ethernet/node.tag/ipv6/ripng/split-horizon/disable/node.def b/templates/interfaces/ethernet/node.tag/ipv6/ripng/split-horizon/disable/node.def new file mode 100644 index 00000000..825f24ab --- /dev/null +++ b/templates/interfaces/ethernet/node.tag/ipv6/ripng/split-horizon/disable/node.def @@ -0,0 +1,12 @@ +help: Disable split horizon on specified interface +create: vyatta-vtysh \ + -c "configure terminal" \ + -c "interface $VAR(../../../../@)" \ + -c "no ipv6 ripng split-horizon" + +delete: vyatta-vtysh \ + -c "configure terminal" \ + -c "interface $VAR(../../../../@)" \ + -c "ipv6 ripng split-horizon" + +commit:expression: ($VAR(../poison-reverse/) == ""); "You cannot have 'split-horizon poison-reverse' enabled with 'split-horizon' disabled for ethernet interface $VAR(../../../../@)" diff --git a/templates/interfaces/ethernet/node.tag/ipv6/ripng/split-horizon/node.def b/templates/interfaces/ethernet/node.tag/ipv6/ripng/split-horizon/node.def new file mode 100644 index 00000000..ba39b616 --- /dev/null +++ b/templates/interfaces/ethernet/node.tag/ipv6/ripng/split-horizon/node.def @@ -0,0 +1 @@ +help: Set to control split horizon parameters on this interface diff --git a/templates/interfaces/ethernet/node.tag/ipv6/ripng/split-horizon/poison-reverse/node.def b/templates/interfaces/ethernet/node.tag/ipv6/ripng/split-horizon/poison-reverse/node.def new file mode 100644 index 00000000..e3b1663b --- /dev/null +++ b/templates/interfaces/ethernet/node.tag/ipv6/ripng/split-horizon/poison-reverse/node.def @@ -0,0 +1,13 @@ +help: Enable poison reverse for split-horizon +create: vyatta-vtysh \ + -c "configure terminal" \ + -c "interface $VAR(../../../../@)" \ + -c "ipv6 ripng split-horizon poisoned-reverse" + +delete: vyatta-vtysh \ + -c "configure terminal" \ + -c "interface $VAR(../../../../@)" \ + -c "no ipv6 ripng split-horizon" \ + -c "ipv6 ripng split-horizon" + +commit:expression: ($VAR(../disable/) == ""); "You cannot have 'split-horizon poison-reverse' enabled with 'split-horizon' disabled for ethernet interface $VAR(../../../../@)" diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/ipv6/ospfv3/cost/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/ipv6/ospfv3/cost/node.def index 2c653c8f..7bae7638 100644 --- a/templates/interfaces/ethernet/node.tag/vif/node.tag/ipv6/ospfv3/cost/node.def +++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/ipv6/ospfv3/cost/node.def @@ -1,8 +1,13 @@ type: u32 help: Set interface cost syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535" -update:expression: "vyatta-vtysh -c \"configure terminal\" \ - -c \"interface $VAR(../../../@)\" \ - -c \"ipv6 ospf6 cost $VAR(@) \"; " +update: vyatta-vtysh \ + -c "configure terminal" \ + -c "interface $VAR(../../../../@).$VAR(../../../@)" \ + -c "ipv6 ospf6 cost $VAR(@)" +delete: vyatta-vtysh \ + -c "configure terminal" \ + -c "interface $VAR(../../../../@).$VAR(../../../@)" \ + -c "no ipv6 ospf6 cost" comp_help: possible completions: - <1-65535> Set Cost + <1-65535> Set cost diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/ipv6/ospfv3/dead-interval/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/ipv6/ospfv3/dead-interval/node.def index fcc3be00..d6967b69 100644 --- a/templates/interfaces/ethernet/node.tag/vif/node.tag/ipv6/ospfv3/dead-interval/node.def +++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/ipv6/ospfv3/dead-interval/node.def @@ -2,8 +2,13 @@ type: u32 help: Set interval after which a neighbor is declared dead default: 40 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535" -update:expression: "vyatta-vtysh \ - -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \ - -c \"ipv6 ospf6 dead-interval $VAR(@)\"; " +update: vyatta-vtysh \ + -c "configure terminal" \ + -c "interface $VAR(../../../../@).$VAR(../../../@)" \ + -c "ipv6 ospf6 dead-interval $VAR(@)" +delete: vyatta-vtysh \ + -c "configure terminal" \ + -c "interface $VAR(../../../../@).$VAR(../../../@)" \ + -c "no ipv6 ospf6 dead-interval" comp_help: possible completions: - <1-65535> Seconds (default 40) + <1-65535> Seconds (default 40) diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/ipv6/ospfv3/hello-interval/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/ipv6/ospfv3/hello-interval/node.def index ae277b4c..450d2b4b 100644 --- a/templates/interfaces/ethernet/node.tag/vif/node.tag/ipv6/ospfv3/hello-interval/node.def +++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/ipv6/ospfv3/hello-interval/node.def @@ -2,8 +2,13 @@ type: u32 help: Set interval between hello packets default: 10 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535" -update:expression: "vyatta-vtysh \ - -c \"configure terminal\" -c \"interface $VAR(../../../@) \" \ - -c \"ipv6 ospf6 hello-interval $VAR(@)\"; " +update: vyatta-vtysh \ + -c "configure terminal" \ + -c "interface $VAR(../../../../@).$VAR(../../../@)" \ + -c "ipv6 ospf6 hello-interval $VAR(@)" +delete: vyatta-vtysh \ + -c "configure terminal" \ + -c "interface $VAR(../../../../@).$VAR(../../../@)" \ + -c "no ipv6 ospf6 hello-interval" comp_help: possible completions: - <1-65535> Seconds (default 10) + <1-65535> Seconds (default 10) diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/ipv6/ospfv3/ifmtu/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/ipv6/ospfv3/ifmtu/node.def index b6b84a87..5f66af6f 100644 --- a/templates/interfaces/ethernet/node.tag/vif/node.tag/ipv6/ospfv3/ifmtu/node.def +++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/ipv6/ospfv3/ifmtu/node.def @@ -1,11 +1,13 @@ type: u32 help: Set interface MTU syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535" -update:expression: "vyatta-vtysh -c \"configure terminal\" \ - -c \"interface $VAR(../../../@)\" \ - -c \"ipv6 ospf6 ifmtu $VAR(@) \"; " -delete:expression: "vyatta-vtysh -c \"configure terminal\" \ - -c \"interface $VAR(../../../@)\" \ - -c \"no ipv6 ospf6 ifmtu \"; " +update: vyatta-vtysh \ + -c "configure terminal" \ + -c "interface $VAR(../../../../@).$VAR(../../../@)" \ + -c "ipv6 ospf6 ifmtu $VAR(@)" +delete: vyatta-vtysh \ + -c "configure terminal" \ + -c "interface $VAR(../../../../@).$VAR(../../../@)" \ + -c "no ipv6 ospf6 ifmtu" comp_help: possible completions: - <1-65535> Set Cost + <1-65535> Set interface MTU diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/ipv6/ospfv3/instance-id/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/ipv6/ospfv3/instance-id/node.def index 4df3aea7..9cd33f16 100644 --- a/templates/interfaces/ethernet/node.tag/vif/node.tag/ipv6/ospfv3/instance-id/node.def +++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/ipv6/ospfv3/instance-id/node.def @@ -2,8 +2,13 @@ type: u32 help: Set instance-id for this interface default: 0 syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 255; "Must be between 0-255" -update:expression: "vyatta-vtysh \ - -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \ - -c \"ipv6 ospf6 instance-id $VAR(@)\"; " +update: vyatta-vtysh \ + -c "configure terminal" \ + -c "interface $VAR(../../../../@).$VAR(../../../@)" \ + -c "ipv6 ospf6 instance-id $VAR(@)" +delete: vyatta-vtysh \ + -c "configure terminal" \ + -c "interface $VAR(../../../../@).$VAR(../../../@)" \ + -c "no ipv6 ospf6 instance-id" comp_help: possible completions: - <0-255> Instance Id (default 0) + <0-255> Instance Id (default 0) diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/ipv6/ospfv3/passive/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/ipv6/ospfv3/passive/node.def index d5a43377..c40b17de 100644 --- a/templates/interfaces/ethernet/node.tag/vif/node.tag/ipv6/ospfv3/passive/node.def +++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/ipv6/ospfv3/passive/node.def @@ -1,7 +1,9 @@ help: Disable forming of adjacency on this interface -create:expression: "vyatta-vtysh - -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \ - -c \"ipv6 ospf6 passive\"; " -delete:expression: "vyatta-vtysh - -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \ - -c \"no ipv6 ospf6 passive\"; " +create: vyatta-vtysh \ + -c "configure terminal" \ + -c "interface $VAR(../../../../@).$VAR(../../../@)" \ + -c "ipv6 ospf6 passive" +delete: vyatta-vtysh \ + -c "configure terminal" \ + -c "interface $VAR(../../../../@).$VAR(../../../@)" \ + -c "no ipv6 ospf6 passive" diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/ipv6/ospfv3/priority/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/ipv6/ospfv3/priority/node.def index efd10574..d459e07f 100644 --- a/templates/interfaces/ethernet/node.tag/vif/node.tag/ipv6/ospfv3/priority/node.def +++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/ipv6/ospfv3/priority/node.def @@ -2,8 +2,13 @@ type: u32 help: Set router priority default: 1 syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 255; "Must be between 0-255" -update:expression: "vyatta-vtysh \ - -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \ - -c \"ipv6 ospf6 priority $VAR(@)\"; " +update: vyatta-vtysh \ + -c "configure terminal" \ + -c "interface $VAR(../../../../@).$VAR(../../../@)" \ + -c "ipv6 ospf6 priority $VAR(@)" +delete: vyatta-vtysh \ + -c "configure terminal" \ + -c "interface $VAR(../../../../@).$VAR(../../../@)" \ + -c "no ipv6 ospf6 priority" comp_help: possible completions: - <0-255> Priority (default 1) + <0-255> Priority (default 1) diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/ipv6/ospfv3/retransmit-interval/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/ipv6/ospfv3/retransmit-interval/node.def index 34651d7a..acc85823 100644 --- a/templates/interfaces/ethernet/node.tag/vif/node.tag/ipv6/ospfv3/retransmit-interval/node.def +++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/ipv6/ospfv3/retransmit-interval/node.def @@ -2,8 +2,13 @@ type: u32 help: Set interval between retransmitting lost link state advertisements default: 5 syntax:expression: $VAR(@) >= 3 && $VAR(@) <= 65535; "Must be between 3-65535" -update:expression: "vyatta-vtysh \ - -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \ - -c \"ipv6 ospf6 retransmit-interval $VAR(@)\"; " +update: vyatta-vtysh \ + -c "configure terminal" \ + -c "interface $VAR(../../../../@).$VAR(../../../@)" \ + -c "ipv6 ospf6 retransmit-interval $VAR(@)" +delete: vyatta-vtysh \ + -c "configure terminal" \ + -c "interface $VAR(../../../../@).$VAR(../../../@)" \ + -c "no ipv6 ospf6 retransmit-interval" comp_help: possible completions: - <3-65535> Seconds (default 5) + <3-65535> Seconds (default 5) diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/ipv6/ospfv3/transmit-delay/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/ipv6/ospfv3/transmit-delay/node.def index 0b623a42..0fc8a699 100644 --- a/templates/interfaces/ethernet/node.tag/vif/node.tag/ipv6/ospfv3/transmit-delay/node.def +++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/ipv6/ospfv3/transmit-delay/node.def @@ -2,8 +2,13 @@ type: u32 help: Set link state transmit delay default: 1 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535" -update:expression: "vyatta-vtysh \ - -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \ - -c \"ipv6 ospf6 transmit-delay $VAR(@)\"; " +update: vyatta-vtysh \ + -c "configure terminal" \ + -c "interface $VAR(../../../../@).$VAR(../../../@)" \ + -c "ipv6 ospf6 transmit-delay $VAR(@)" +delete: vyatta-vtysh \ + -c "configure terminal" \ + -c "interface $VAR(../../../../@).$VAR(../../../@)" \ + -c "no ipv6 ospf6 transmit-delay" comp_help: possible completions: - <1-65535> Seconds (default 1) + <1-65535> Seconds (default 1) diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/ipv6/ripng/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/ipv6/ripng/node.def new file mode 100644 index 00000000..cb2d89aa --- /dev/null +++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/ipv6/ripng/node.def @@ -0,0 +1 @@ +help: Set Routing Information Protocol (RIPng) for specified interface diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/ipv6/ripng/split-horizon/disable/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/ipv6/ripng/split-horizon/disable/node.def new file mode 100644 index 00000000..c2dbb4f3 --- /dev/null +++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/ipv6/ripng/split-horizon/disable/node.def @@ -0,0 +1,12 @@ +help: Disable split horizon on specified interface +create: vyatta-vtysh \ + -c "configure terminal" \ + -c "interface $VAR(../../../../../@).$VAR(../../../../@)" \ + -c "no ipv6 ripng split-horizon" + +delete: vyatta-vtysh \ + -c "configure terminal" \ + -c "interface $VAR(../../../../../@).$VAR(../../../../@)" \ + -c "ipv6 ripng split-horizon" + +commit:expression: ($VAR(../poison-reverse/) == ""); "You cannot have 'split-horizon poison-reverse' enabled with 'split-horizon' disabled for ethernet interface $VAR(../../../../@)" diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/ipv6/ripng/split-horizon/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/ipv6/ripng/split-horizon/node.def new file mode 100644 index 00000000..ba39b616 --- /dev/null +++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/ipv6/ripng/split-horizon/node.def @@ -0,0 +1 @@ +help: Set to control split horizon parameters on this interface diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/ipv6/ripng/split-horizon/poison-reverse/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/ipv6/ripng/split-horizon/poison-reverse/node.def new file mode 100644 index 00000000..dc6fc0e6 --- /dev/null +++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/ipv6/ripng/split-horizon/poison-reverse/node.def @@ -0,0 +1,13 @@ +help: Enable poison reverse for split-horizon +create: vyatta-vtysh \ + -c "configure terminal" \ + -c "interface $VAR(../../../../../@).$VAR(../../../../@)" \ + -c "ipv6 ripng split-horizon poisoned-reverse" + +delete: vyatta-vtysh \ + -c "configure terminal" \ + -c "interface $VAR(../../../../../@).$VAR(../../../../@)" \ + -c "no ipv6 ripng split-horizon" \ + -c "ipv6 ripng split-horizon" + +commit:expression: ($VAR(../disable/) == ""); "You cannot have 'split-horizon poison-reverse' enabled with 'split-horizon' disabled for ethernet interface $VAR(../../../../@)" diff --git a/templates/interfaces/loopback/node.tag/ipv6/ripng/node.def b/templates/interfaces/loopback/node.tag/ipv6/ripng/node.def new file mode 100644 index 00000000..cb2d89aa --- /dev/null +++ b/templates/interfaces/loopback/node.tag/ipv6/ripng/node.def @@ -0,0 +1 @@ +help: Set Routing Information Protocol (RIPng) for specified interface diff --git a/templates/interfaces/loopback/node.tag/ipv6/ripng/split-horizon/disable/node.def b/templates/interfaces/loopback/node.tag/ipv6/ripng/split-horizon/disable/node.def new file mode 100644 index 00000000..825f24ab --- /dev/null +++ b/templates/interfaces/loopback/node.tag/ipv6/ripng/split-horizon/disable/node.def @@ -0,0 +1,12 @@ +help: Disable split horizon on specified interface +create: vyatta-vtysh \ + -c "configure terminal" \ + -c "interface $VAR(../../../../@)" \ + -c "no ipv6 ripng split-horizon" + +delete: vyatta-vtysh \ + -c "configure terminal" \ + -c "interface $VAR(../../../../@)" \ + -c "ipv6 ripng split-horizon" + +commit:expression: ($VAR(../poison-reverse/) == ""); "You cannot have 'split-horizon poison-reverse' enabled with 'split-horizon' disabled for ethernet interface $VAR(../../../../@)" diff --git a/templates/interfaces/loopback/node.tag/ipv6/ripng/split-horizon/node.def b/templates/interfaces/loopback/node.tag/ipv6/ripng/split-horizon/node.def new file mode 100644 index 00000000..ba39b616 --- /dev/null +++ b/templates/interfaces/loopback/node.tag/ipv6/ripng/split-horizon/node.def @@ -0,0 +1 @@ +help: Set to control split horizon parameters on this interface diff --git a/templates/interfaces/loopback/node.tag/ipv6/ripng/split-horizon/poison-reverse/node.def b/templates/interfaces/loopback/node.tag/ipv6/ripng/split-horizon/poison-reverse/node.def new file mode 100644 index 00000000..e3b1663b --- /dev/null +++ b/templates/interfaces/loopback/node.tag/ipv6/ripng/split-horizon/poison-reverse/node.def @@ -0,0 +1,13 @@ +help: Enable poison reverse for split-horizon +create: vyatta-vtysh \ + -c "configure terminal" \ + -c "interface $VAR(../../../../@)" \ + -c "ipv6 ripng split-horizon poisoned-reverse" + +delete: vyatta-vtysh \ + -c "configure terminal" \ + -c "interface $VAR(../../../../@)" \ + -c "no ipv6 ripng split-horizon" \ + -c "ipv6 ripng split-horizon" + +commit:expression: ($VAR(../disable/) == ""); "You cannot have 'split-horizon poison-reverse' enabled with 'split-horizon' disabled for ethernet interface $VAR(../../../../@)" diff --git a/templates/interfaces/multilink/node.tag/ipv6/ripng/node.def b/templates/interfaces/multilink/node.tag/ipv6/ripng/node.def new file mode 100644 index 00000000..cb2d89aa --- /dev/null +++ b/templates/interfaces/multilink/node.tag/ipv6/ripng/node.def @@ -0,0 +1 @@ +help: Set Routing Information Protocol (RIPng) for specified interface diff --git a/templates/interfaces/multilink/node.tag/ipv6/ripng/split-horizon/disable/node.def b/templates/interfaces/multilink/node.tag/ipv6/ripng/split-horizon/disable/node.def new file mode 100644 index 00000000..825f24ab --- /dev/null +++ b/templates/interfaces/multilink/node.tag/ipv6/ripng/split-horizon/disable/node.def @@ -0,0 +1,12 @@ +help: Disable split horizon on specified interface +create: vyatta-vtysh \ + -c "configure terminal" \ + -c "interface $VAR(../../../../@)" \ + -c "no ipv6 ripng split-horizon" + +delete: vyatta-vtysh \ + -c "configure terminal" \ + -c "interface $VAR(../../../../@)" \ + -c "ipv6 ripng split-horizon" + +commit:expression: ($VAR(../poison-reverse/) == ""); "You cannot have 'split-horizon poison-reverse' enabled with 'split-horizon' disabled for ethernet interface $VAR(../../../../@)" diff --git a/templates/interfaces/multilink/node.tag/ipv6/ripng/split-horizon/node.def b/templates/interfaces/multilink/node.tag/ipv6/ripng/split-horizon/node.def new file mode 100644 index 00000000..ba39b616 --- /dev/null +++ b/templates/interfaces/multilink/node.tag/ipv6/ripng/split-horizon/node.def @@ -0,0 +1 @@ +help: Set to control split horizon parameters on this interface diff --git a/templates/interfaces/multilink/node.tag/ipv6/ripng/split-horizon/poison-reverse/node.def b/templates/interfaces/multilink/node.tag/ipv6/ripng/split-horizon/poison-reverse/node.def new file mode 100644 index 00000000..e3b1663b --- /dev/null +++ b/templates/interfaces/multilink/node.tag/ipv6/ripng/split-horizon/poison-reverse/node.def @@ -0,0 +1,13 @@ +help: Enable poison reverse for split-horizon +create: vyatta-vtysh \ + -c "configure terminal" \ + -c "interface $VAR(../../../../@)" \ + -c "ipv6 ripng split-horizon poisoned-reverse" + +delete: vyatta-vtysh \ + -c "configure terminal" \ + -c "interface $VAR(../../../../@)" \ + -c "no ipv6 ripng split-horizon" \ + -c "ipv6 ripng split-horizon" + +commit:expression: ($VAR(../disable/) == ""); "You cannot have 'split-horizon poison-reverse' enabled with 'split-horizon' disabled for ethernet interface $VAR(../../../../@)" diff --git a/templates/interfaces/tunnel/node.tag/ipv6/ripng/node.def b/templates/interfaces/tunnel/node.tag/ipv6/ripng/node.def new file mode 100644 index 00000000..cb2d89aa --- /dev/null +++ b/templates/interfaces/tunnel/node.tag/ipv6/ripng/node.def @@ -0,0 +1 @@ +help: Set Routing Information Protocol (RIPng) for specified interface diff --git a/templates/interfaces/tunnel/node.tag/ipv6/ripng/split-horizon/disable/node.def b/templates/interfaces/tunnel/node.tag/ipv6/ripng/split-horizon/disable/node.def new file mode 100644 index 00000000..825f24ab --- /dev/null +++ b/templates/interfaces/tunnel/node.tag/ipv6/ripng/split-horizon/disable/node.def @@ -0,0 +1,12 @@ +help: Disable split horizon on specified interface +create: vyatta-vtysh \ + -c "configure terminal" \ + -c "interface $VAR(../../../../@)" \ + -c "no ipv6 ripng split-horizon" + +delete: vyatta-vtysh \ + -c "configure terminal" \ + -c "interface $VAR(../../../../@)" \ + -c "ipv6 ripng split-horizon" + +commit:expression: ($VAR(../poison-reverse/) == ""); "You cannot have 'split-horizon poison-reverse' enabled with 'split-horizon' disabled for ethernet interface $VAR(../../../../@)" diff --git a/templates/interfaces/tunnel/node.tag/ipv6/ripng/split-horizon/node.def b/templates/interfaces/tunnel/node.tag/ipv6/ripng/split-horizon/node.def new file mode 100644 index 00000000..ba39b616 --- /dev/null +++ b/templates/interfaces/tunnel/node.tag/ipv6/ripng/split-horizon/node.def @@ -0,0 +1 @@ +help: Set to control split horizon parameters on this interface diff --git a/templates/interfaces/tunnel/node.tag/ipv6/ripng/split-horizon/poison-reverse/node.def b/templates/interfaces/tunnel/node.tag/ipv6/ripng/split-horizon/poison-reverse/node.def new file mode 100644 index 00000000..e3b1663b --- /dev/null +++ b/templates/interfaces/tunnel/node.tag/ipv6/ripng/split-horizon/poison-reverse/node.def @@ -0,0 +1,13 @@ +help: Enable poison reverse for split-horizon +create: vyatta-vtysh \ + -c "configure terminal" \ + -c "interface $VAR(../../../../@)" \ + -c "ipv6 ripng split-horizon poisoned-reverse" + +delete: vyatta-vtysh \ + -c "configure terminal" \ + -c "interface $VAR(../../../../@)" \ + -c "no ipv6 ripng split-horizon" \ + -c "ipv6 ripng split-horizon" + +commit:expression: ($VAR(../disable/) == ""); "You cannot have 'split-horizon poison-reverse' enabled with 'split-horizon' disabled for ethernet interface $VAR(../../../../@)" diff --git a/templates/protocols/ospf/passive-interface/node.def b/templates/protocols/ospf/passive-interface/node.def index 841bd340..9db0aca8 100644 --- a/templates/protocols/ospf/passive-interface/node.def +++ b/templates/protocols/ospf/passive-interface/node.def @@ -1,8 +1,13 @@ multi: type: txt help: Set to suppress routing updates on an interface -syntax:expression: exec "${vyatta_sbindir}/vyatta-interfaces.pl --check $VAR(@)" -allowed: ${vyatta_sbindir}/vyatta-interfaces.pl --show all + +syntax: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" \ -c "passive-interface default"; @@ -15,3 +20,6 @@ delete: if [ -z $VAR(@) ] else vyatta-vtysh -c "configure terminal" -c "router ospf" \ -c "no passive-interface $VAR(@)" fi +comp_help: possible completions: + <interface> Set an interface to be passive (i.e. suppress routing updates) + default Set default to suppress routing updates on all interfaces diff --git a/templates/protocols/static/interface-route/node.tag/next-hop-interface/node.def b/templates/protocols/static/interface-route/node.tag/next-hop-interface/node.def index e9f4f764..cd739481 100644 --- a/templates/protocols/static/interface-route/node.tag/next-hop-interface/node.def +++ b/templates/protocols/static/interface-route/node.tag/next-hop-interface/node.def @@ -5,12 +5,10 @@ help: Set the next-hop interface # but syntax accepts any interface since it may exist later (ppp etc) allowed: ${vyatta_sbindir}/vyatta-interfaces.pl --show all -delete: touch /tmp/static.$PPID -end: if [ -f "/tmp/static.$PPID" ]; then +end: if [ ${COMMIT_ACTION} = 'DELETE' ]; then vyatta-vtysh -c "configure terminal" \ -c "no ip route $VAR(../@) $VAR(@)"; - rm /tmp/static.$PPID; else if [ -n "$VAR(./distance/@)" ]; then DIST="$VAR(./distance/@)"; diff --git a/templates/protocols/static/interface-route6/node.tag/next-hop-interface/node.def b/templates/protocols/static/interface-route6/node.tag/next-hop-interface/node.def index 2d5eb281..052e1a2f 100644 --- a/templates/protocols/static/interface-route6/node.tag/next-hop-interface/node.def +++ b/templates/protocols/static/interface-route6/node.tag/next-hop-interface/node.def @@ -5,12 +5,9 @@ help: Set the next-hop interface # but syntax accepts any interface since it may exist later (ppp etc) allowed: ${vyatta_sbindir}/vyatta-interfaces.pl --show all -delete: touch /tmp/static.$PPID - -end: if [ -f "/tmp/static.$PPID" ]; then +end: if [ ${COMMIT_ACTION} = 'DELETE' ]; then vyatta-vtysh -c "configure terminal" \ -c "no ipv6 route $VAR(../@) $VAR(@)"; - rm /tmp/static.$PPID; else if [ -n "$VAR(./distance/@)" ]; then DIST="$VAR(./distance/@)"; diff --git a/templates/protocols/static/route/node.tag/blackhole/node.def b/templates/protocols/static/route/node.tag/blackhole/node.def index f3844833..14375e0e 100644 --- a/templates/protocols/static/route/node.tag/blackhole/node.def +++ b/templates/protocols/static/route/node.tag/blackhole/node.def @@ -1,11 +1,8 @@ help: Set to silently discard pkts when matched -delete: touch /tmp/static.$PPID - -end: if [ -f "/tmp/static.$PPID" ]; then +end: if [ ${COMMIT_ACTION} = 'DELETE' ]; then vyatta-vtysh -c "configure terminal" \ -c "no ip route $VAR(../@) null0"; - rm /tmp/static.$PPID; else if [ -n "$VAR(./distance/@)" ]; then DIST="$VAR(./distance/@)"; diff --git a/templates/protocols/static/route/node.tag/next-hop/node.def b/templates/protocols/static/route/node.tag/next-hop/node.def index e631df83..c8632ed8 100644 --- a/templates/protocols/static/route/node.tag/next-hop/node.def +++ b/templates/protocols/static/route/node.tag/next-hop/node.def @@ -1,8 +1,7 @@ tag: type: ipv4 help: Set the next-hop router -delete: touch /tmp/static.$PPID -end: if [[ -f /tmp/static.$PPID ]] +end: if [[ ${COMMIT_ACTION} = 'DELETE' ]] then if ${vyatta_sbindir}/vyatta-gateway-static_route-check.pl \ "$VAR(../@)" "$VAR(@)" @@ -10,7 +9,6 @@ end: if [[ -f /tmp/static.$PPID ]] vyatta-vtysh -c "configure terminal" \ -c "no ip route $VAR(../@) $VAR(@)" fi - rm -f /tmp/static.$PPID else if [[ -n "$VAR(./distance/@)" ]] then diff --git a/templates/protocols/static/route6/node.tag/blackhole/node.def b/templates/protocols/static/route6/node.tag/blackhole/node.def index bd8601d5..a4066ee6 100644 --- a/templates/protocols/static/route6/node.tag/blackhole/node.def +++ b/templates/protocols/static/route6/node.tag/blackhole/node.def @@ -1,10 +1,8 @@ help: Set to silently discard pkts when matched -delete:expression: "touch /tmp/static.$PPID" -end: if [ -f "/tmp/static.$PPID" ]; then +end: if [ ${COMMIT_ACTION} = 'DELETE' ]; then vyatta-vtysh -c "configure terminal" \ -c "no ipv6 route $VAR(../@) null0"; - rm /tmp/static.$PPID; else if [ -n "$VAR(./distance/@)" ]; then DIST="$VAR(./distance/@)"; diff --git a/templates/protocols/static/route6/node.tag/next-hop/node.def b/templates/protocols/static/route6/node.tag/next-hop/node.def index 3f9cd440..e58c4fcc 100644 --- a/templates/protocols/static/route6/node.tag/next-hop/node.def +++ b/templates/protocols/static/route6/node.tag/next-hop/node.def @@ -1,12 +1,10 @@ tag: type: ipv6 help: Set the next-hop IPv6 router -delete: touch /tmp/static.$PPID -end: if [ -f "/tmp/static.$PPID" ]; then +end: if [ ${COMMIT_ACTION} = 'DELETE' ]; then if ${vyatta_sbindir}/vyatta-gateway-static_route-check.pl "$VAR(../@)" "$VAR(@)"; then vyatta-vtysh -c "configure terminal" -c "no ipv6 route $VAR(../@) $VAR(@)" ; fi; - rm /tmp/static.$PPID; else if [ -n "$VAR(./distance/@)" ]; then DIST="$VAR(./distance/@)"; |