diff options
| author | Stig Thormodsrud <stig@vyatta.com> | 2009-04-04 14:23:28 -0700 |
|---|---|---|
| committer | Stig Thormodsrud <stig@vyatta.com> | 2009-04-04 14:23:28 -0700 |
| commit | 34d31abfb94afe4c9e71292bf207302d5fae71ea (patch) | |
| tree | 03d4d4a09b1441d239c44f9772d70ebfc25f6989 | |
| parent | 30e1432faf2dfd1ec3ab78479355e08b262521e2 (diff) | |
| download | vyatta-cfg-quagga-34d31abfb94afe4c9e71292bf207302d5fae71ea.tar.gz vyatta-cfg-quagga-34d31abfb94afe4c9e71292bf207302d5fae71ea.zip | |
Move "commit" check out of invalid node.tag/node.def.
8 files changed, 14 insertions, 6 deletions
diff --git a/templates/protocols/static/interface-route/node.def b/templates/protocols/static/interface-route/node.def index a30f4dac..5b5f3efe 100644 --- a/templates/protocols/static/interface-route/node.def +++ b/templates/protocols/static/interface-route/node.def @@ -2,3 +2,6 @@ tag: type: ipv4net help: Set an interface-based static route syntax:expression: exec "${vyatta_sbindir}/check_prefix_boundary $VAR(@)" + +commit:expression: $VAR(./next-hop-interface/) != "" ; \ + "Must add a next-hop-interface for route $VAR(@)" diff --git a/templates/protocols/static/interface-route/node.tag/node.def b/templates/protocols/static/interface-route/node.tag/node.def index 1bc36220..a628b753 100644 --- a/templates/protocols/static/interface-route/node.tag/node.def +++ b/templates/protocols/static/interface-route/node.tag/node.def @@ -1,3 +1 @@ help: Set IP network -commit:expression: $VAR(./next-hop-interface/) != "" ; \ - "Must add a next-hop-interface for route $VAR(@)" diff --git a/templates/protocols/static/interface-route6/node.def b/templates/protocols/static/interface-route6/node.def index 4048960a..e00a8b3b 100644 --- a/templates/protocols/static/interface-route6/node.def +++ b/templates/protocols/static/interface-route6/node.def @@ -2,3 +2,6 @@ tag: type: ipv6net help: Set an interface-based IPv6 static route syntax:expression: exec "${vyatta_sbindir}/check_prefix_boundary $VAR(@)" + +commit:expression: $VAR(./next-hop-interface/) != "" ; \ + "Must add a next-hop-interface for route $VAR(@)" diff --git a/templates/protocols/static/interface-route6/node.tag/node.def b/templates/protocols/static/interface-route6/node.tag/node.def index 1bc36220..f5c3f487 100644 --- a/templates/protocols/static/interface-route6/node.tag/node.def +++ b/templates/protocols/static/interface-route6/node.tag/node.def @@ -1,3 +1,2 @@ help: Set IP network -commit:expression: $VAR(./next-hop-interface/) != "" ; \ - "Must add a next-hop-interface for route $VAR(@)" + diff --git a/templates/protocols/static/route/node.def b/templates/protocols/static/route/node.def index 74cf3715..88c91801 100644 --- a/templates/protocols/static/route/node.def +++ b/templates/protocols/static/route/node.def @@ -2,3 +2,6 @@ tag: type: ipv4net help: Set a static route 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/node.def b/templates/protocols/static/route/node.tag/node.def index 7e15c498..f5c3f487 100644 --- a/templates/protocols/static/route/node.tag/node.def +++ b/templates/protocols/static/route/node.tag/node.def @@ -1,3 +1,2 @@ help: Set IP network -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.def b/templates/protocols/static/route6/node.def index 0be98812..d33d73ea 100644 --- a/templates/protocols/static/route6/node.def +++ b/templates/protocols/static/route6/node.def @@ -2,3 +2,6 @@ tag: type: ipv6net help: Set a static IPv6 route 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/node.def b/templates/protocols/static/route6/node.tag/node.def index 7e15c498..ecc2c12f 100644 --- a/templates/protocols/static/route6/node.tag/node.def +++ b/templates/protocols/static/route6/node.tag/node.def @@ -1,3 +1,3 @@ help: Set IP network -commit:expression: $VAR(./next-hop/) != "" || $VAR(./blackhole/) != ""; "Must add either a next-hop or blackhole for route $VAR(@)" + |