diff options
| author | Bharat <bharat.bandaru@vyatta.com> | 2012-10-04 11:20:00 -0700 |
|---|---|---|
| committer | Bharat <bharat.bandaru@vyatta.com> | 2012-10-04 11:20:00 -0700 |
| commit | e47788dc5abec3c8f3d35513fc3b597ebd3beff3 (patch) | |
| tree | a909ea3ce833dad01b2e67904210b26d005919ab /templates/protocols | |
| parent | cf0ffab4a0f622b85d1dbcc6715c80226e19d791 (diff) | |
| download | vyatta-cfg-quagga-e47788dc5abec3c8f3d35513fc3b597ebd3beff3.tar.gz vyatta-cfg-quagga-e47788dc5abec3c8f3d35513fc3b597ebd3beff3.zip | |
Bug 8345: Reverting changes which were committed against bug 8345. We are seeing issues when we are upgrading to pacifica from
earlier releases. Customers may have the multicast blackhole route in earlier releases which is causing the issue
after upgrade. This will fail the commit for the other unicast routes.
Diffstat (limited to 'templates/protocols')
4 files changed, 2 insertions, 5 deletions
diff --git a/templates/protocols/static/route/node.def b/templates/protocols/static/route/node.def index ced516ea..682ca944 100644 --- a/templates/protocols/static/route/node.def +++ b/templates/protocols/static/route/node.def @@ -1,7 +1,7 @@ tag: type: ipv4net help: Static route -syntax:expression: exec "${vyatta_sbindir}/check_prefix_boundary -4 $VAR(@)" +syntax:expression: exec "${vyatta_sbindir}/check_prefix_boundary $VAR(@)" commit:expression: $VAR(./next-hop/) != "" || $VAR(./blackhole/) != ""; \ "Must add either a next-hop or blackhole for route $VAR(@)" 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 89d00664..f5d5d417 100644 --- a/templates/protocols/static/route/node.tag/next-hop/node.def +++ b/templates/protocols/static/route/node.tag/next-hop/node.def @@ -1,7 +1,6 @@ tag: type: ipv4 help: Next-hop router [REQUIRED] -syntax:expression: exec "${vyatta_sbindir}/check_next_hop -4 $VAR(@)" end: if [[ -z "$VAR(./disable)" ]] then diff --git a/templates/protocols/static/route6/node.def b/templates/protocols/static/route6/node.def index bba42943..de3f1cd8 100644 --- a/templates/protocols/static/route6/node.def +++ b/templates/protocols/static/route6/node.def @@ -1,7 +1,7 @@ tag: type: ipv6net help: Static IPv6 route -syntax:expression: exec "${vyatta_sbindir}/check_prefix_boundary -6 $VAR(@)" +syntax:expression: exec "${vyatta_sbindir}/check_prefix_boundary $VAR(@)" commit:expression: $VAR(./next-hop/) != "" || $VAR(./blackhole/) != ""; \ "Must add either a next-hop or blackhole for route $VAR(@)" 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 82bc78a8..e3a668b7 100644 --- a/templates/protocols/static/route6/node.tag/next-hop/node.def +++ b/templates/protocols/static/route6/node.tag/next-hop/node.def @@ -4,8 +4,6 @@ type: ipv6 help: Next-hop IPv6 router [REQUIRED] -syntax:expression: exec "${vyatta_sbindir}/check_next_hop -6 $VAR(@)" - end: if [[ -z "$VAR(./disable)" ]] then |