diff options
| author | Robert Bays <robert@vyatta.com> | 2010-07-12 14:33:10 -0700 |
|---|---|---|
| committer | Robert Bays <robert@vyatta.com> | 2010-07-12 14:33:10 -0700 |
| commit | b3c9e4da4ab2b2c8e367db6288a864f0842c15dd (patch) | |
| tree | bdb22c1de58f297ac2f9734ca0b686d3ab065eaa /templates | |
| parent | 43c42a98e5eb006a205e04d750a5a9f8a5d0f42f (diff) | |
| parent | f9adbe8e73aad0bb4fcd52b720bd77082c04854e (diff) | |
| download | vyatta-cfg-quagga-b3c9e4da4ab2b2c8e367db6288a864f0842c15dd.tar.gz vyatta-cfg-quagga-b3c9e4da4ab2b2c8e367db6288a864f0842c15dd.zip | |
Merge branch 'larkspur' of http://git.vyatta.com/vyatta-cfg-quagga into larkspur
Diffstat (limited to 'templates')
3 files changed, 15 insertions, 3 deletions
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/ttl-security/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/ttl-security/node.def index 05be9f5b..f8127f10 100644 --- a/templates/protocols/bgp/node.tag/neighbor/node.tag/ttl-security/node.def +++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/ttl-security/node.def @@ -1,2 +1,7 @@ +type: u32 help: Set ttl security mechanism for this BGP peer +comp_help: possible completions: + <1-254> maximum number of hops that separate two peers +syntax:expression: $VAR(@) >=1 && $VAR(@) <= 254 ; \ + "ttl-security must be between 1 and 254" commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --not-exists \"protocols bgp $VAR(../../@) neighbor $VAR(../@) ebgp-multihop\" "; "protocols bgp $VAR(../../@) neighbor $VAR(../@) ttl-security: you can't set both ebgp-multihop and ttl-security" diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/ttl-security/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/ttl-security/node.def new file mode 100644 index 00000000..bf7c0f39 --- /dev/null +++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/ttl-security/node.def @@ -0,0 +1,8 @@ +type: u32 +help: Set ttl security mechanism for this peer-group +comp_help: possible completions: + <1-254> maximum number of hops that separate two peers +syntax:expression: $VAR(@) >=1 && $VAR(@) <= 254 ; \ + "ttl-security must be between 1 and 254" + +commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --not-exists \"protocols bgp $VAR(../../@) neighbor $VAR(../@) ebgp-multihop\" "; "protocols bgp $VAR(../../@) neighbor $VAR(../@) ttl-security: you can't set both ebgp-multihop and ttl-security" diff --git a/templates/protocols/static/arp/node.def b/templates/protocols/static/arp/node.def index 0174b24c..a7905c57 100644 --- a/templates/protocols/static/arp/node.def +++ b/templates/protocols/static/arp/node.def @@ -35,9 +35,8 @@ comp_help: Possible completions: end: ipaddr=$VAR(@) hwaddr=$VAR(hwaddr/@) - - sudo arp -d $ipaddr > /dev/null + /usr/sbin/arp -d $ipaddr > /dev/null if [ -n "$hwaddr" ]; then - sudo arp -s $ipaddr $hwaddr + /usr/sbin/arp -s $ipaddr $hwaddr fi exit 0 |