diff options
| author | Stig Thormodsrud <stig@vyatta.com> | 2011-01-01 16:14:48 -0800 |
|---|---|---|
| committer | Stig Thormodsrud <stig@vyatta.com> | 2011-01-01 16:14:48 -0800 |
| commit | 47914551530e3ef2232ce18959d08a6018f9a580 (patch) | |
| tree | e0e8d6f9fbbc32bd68694510f5b381dfea8c9814 /templates | |
| parent | fa8b079a5e0b370bee12ba9bde63eef925ef4043 (diff) | |
| parent | e09955a8cfc8a2d8f10f0aa3c4f1bdf8e33bdb16 (diff) | |
| download | vyatta-cfg-quagga-47914551530e3ef2232ce18959d08a6018f9a580.tar.gz vyatta-cfg-quagga-47914551530e3ef2232ce18959d08a6018f9a580.zip | |
Merge branch 'mendocino' of http://git.vyatta.com/vyatta-cfg-quagga into mendocino
Diffstat (limited to 'templates')
6 files changed, 10 insertions, 6 deletions
diff --git a/templates/protocols/bgp/node.def b/templates/protocols/bgp/node.def index 3e9e6b51..01f75f02 100644 --- a/templates/protocols/bgp/node.def +++ b/templates/protocols/bgp/node.def @@ -7,4 +7,8 @@ val_help: u32:1-4294967294; AS number syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 4294967294 ; \ "AS number must be between 1 and 4294967294" -end: /opt/vyatta/sbin/vyatta-bgp.pl --main +end: + +if [ "$COMMIT_SIBLING_POSITION" != "LAST" ] ; then + /opt/vyatta/sbin/vyatta-bgp.pl --main +fi; diff --git a/templates/protocols/bgp/node.tag/neighbor/node.def b/templates/protocols/bgp/node.tag/neighbor/node.def index 122f2f17..a41fc20d 100644 --- a/templates/protocols/bgp/node.tag/neighbor/node.def +++ b/templates/protocols/bgp/node.tag/neighbor/node.def @@ -1,5 +1,5 @@ tag: -type: txt +type: ipv4, ipv6 help: BGP neighbor val_help: ipv4; BGP neighbor IP address val_help: ipv6; BGP neighbor IPv6 address diff --git a/templates/protocols/ospfv3/area/node.tag/.filter-list/node.def b/templates/protocols/ospfv3/area/node.tag/.filter-list/node.def index 791b3f5a..02729e7e 100644 --- a/templates/protocols/ospfv3/area/node.tag/.filter-list/node.def +++ b/templates/protocols/ospfv3/area/node.tag/.filter-list/node.def @@ -1,2 +1,2 @@ type: txt -help: Set filter-list +help: Filter list diff --git a/templates/protocols/ospfv3/area/node.tag/.filter-list/node.tag/node.def b/templates/protocols/ospfv3/area/node.tag/.filter-list/node.tag/node.def index 873e2435..5fa7a60c 100644 --- a/templates/protocols/ospfv3/area/node.tag/.filter-list/node.tag/node.def +++ b/templates/protocols/ospfv3/area/node.tag/.filter-list/node.tag/node.def @@ -1,4 +1,4 @@ tag: type: txt -help: Set direction of filter (in|out) +help: Direction of filter (in|out) allowed: echo "in out" diff --git a/templates/protocols/rip/network-distance/node.tag/access-list/node.def b/templates/protocols/rip/network-distance/node.tag/access-list/node.def index a7bc9a6f..3003e718 100644 --- a/templates/protocols/rip/network-distance/node.tag/access-list/node.def +++ b/templates/protocols/rip/network-distance/node.tag/access-list/node.def @@ -1,3 +1,3 @@ type: txt -help: Set access list +help: Access list commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy access-list $VAR(@)\" ";"access-list $VAR(@) doesn't exist" diff --git a/templates/protocols/rip/timers/garbage-collection/node.def b/templates/protocols/rip/timers/garbage-collection/node.def index b482ded1..a88d2324 100644 --- a/templates/protocols/rip/timers/garbage-collection/node.def +++ b/templates/protocols/rip/timers/garbage-collection/node.def @@ -1,6 +1,6 @@ type: u32 default: 120 -help: Set garbage collection timer +help: Garbage collection timer syntax:expression: $VAR(@) >= 5 && $VAR(@) <= 2147483647; \ "Garbage collection timer must be between 5 and 2147483647" val_help: u32:5-2147483647; Garbage colletion time (default 120) |