summaryrefslogtreecommitdiff
path: root/templates
diff options
context:
space:
mode:
authorRobert Bays <robert@vyatta.com>2010-08-06 15:40:27 -0700
committerAn-Cheng Huang <ancheng@vyatta.com>2010-08-10 10:32:09 -0700
commit23adebecd0c65e465cc6fbde3a676376e28fef81 (patch)
tree98ebb4211ca865c0a41a57dd68e5329054a4e527 /templates
parentd0ce0f3fdc14cc9559c8835f00a9dccace4ba9fe (diff)
downloadvyatta-cfg-quagga-23adebecd0c65e465cc6fbde3a676376e28fef81.tar.gz
vyatta-cfg-quagga-23adebecd0c65e465cc6fbde3a676376e28fef81.zip
fix for bug 5925
(cherry picked from commit 0773ce1032d07f7f74e2b41c0f160570a8ed66a1)
Diffstat (limited to 'templates')
-rw-r--r--templates/protocols/bgp/node.tag/parameters/confederation/peers/node.def2
1 files changed, 1 insertions, 1 deletions
diff --git a/templates/protocols/bgp/node.tag/parameters/confederation/peers/node.def b/templates/protocols/bgp/node.tag/parameters/confederation/peers/node.def
index a5d5b671..52823424 100644
--- a/templates/protocols/bgp/node.tag/parameters/confederation/peers/node.def
+++ b/templates/protocols/bgp/node.tag/parameters/confederation/peers/node.def
@@ -3,4 +3,4 @@ type: u32
help: Peer ASs in the BGP confederation
val_help: u32:1-4294967294; Peer AS number numbers (ex: "435 234")
syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 4294967294; "confederation AS id must be between 1 and 4294967294"
-commit:expression: exec "/opt/vyatta/sbin/vyatta-bgp.pl --check-for-iBGP-ASN $VAR(@) --as $VAR(../../../@)"; "can't set confederation ASN to $VAR(@). Delete neighbors with remote-as $VAR(@) first."
+commit:expression: exec "/opt/vyatta/sbin/vyatta-bgp.pl --check-for-iBGP-ASN $VAR(@) --as $VAR(../../../@)"; "Can't set confederation peers ASN to $VAR(@). Delete any neighbors with remote-as $VAR(@) and/or change the local ASN first."