diff options
| author | susheela <susheela.vaidya@vyatta.com> | 2012-10-06 15:28:22 -0700 |
|---|---|---|
| committer | susheela <susheela.vaidya@vyatta.com> | 2012-10-06 15:28:22 -0700 |
| commit | 473953777890587b54254d243b2b56f0e76b1a56 (patch) | |
| tree | 14f183237378493098b29b1e28978e7af2fd916b /templates | |
| parent | 8ba7a2f544b20a53380f9019c8c72913b98195d5 (diff) | |
| parent | 93268c07a6514bd33e142b1c1d42d14f9fe0b40b (diff) | |
| download | vyatta-cfg-quagga-473953777890587b54254d243b2b56f0e76b1a56.tar.gz vyatta-cfg-quagga-473953777890587b54254d243b2b56f0e76b1a56.zip | |
Merge branch 'pacifica' of git.vyatta.com:/git/vyatta-cfg-quagga into pacifica
Diffstat (limited to 'templates')
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 |