diff options
| author | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2009-06-03 11:30:57 -0700 |
|---|---|---|
| committer | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2009-07-09 16:50:06 -0700 |
| commit | 3b3fc34c6d6cb71b1cb00edee2cd12a96ee772ec (patch) | |
| tree | 164f6e47cd52b9e483aa4dac2dfe76e335cda1d4 | |
| parent | ad613a41773adf48e909fd13af26e63aaaf1488b (diff) | |
| download | vyatta-cfg-quagga-3b3fc34c6d6cb71b1cb00edee2cd12a96ee772ec.tar.gz vyatta-cfg-quagga-3b3fc34c6d6cb71b1cb00edee2cd12a96ee772ec.zip | |
Use bgpd default import-check flag
Move the default import-check enabled from template to command line
option in bgpd. This resolves some of the startup issues.
(cherry picked from commit a1d23a42ef83968222b0744505986db3e02b0ae8)
| -rwxr-xr-x | scripts/quagga-manager | 7 | ||||
| -rw-r--r-- | templates/protocols/bgp/node.def | 6 |
2 files changed, 6 insertions, 7 deletions
diff --git a/scripts/quagga-manager b/scripts/quagga-manager index 220a5fba..be0435b9 100755 --- a/scripts/quagga-manager +++ b/scripts/quagga-manager @@ -43,9 +43,10 @@ start() { fi local -a args=( -d -P 0 -i $pidfile ) - if [ "$daemon" = "zebra" ]; then - args+=( -l -S -s 1048576 ) - fi + case $daemon in + zebra) args+=( -l -S -s 1048576 );; + bgpd) args+=( -I );; + esac exec start-stop-daemon --start --oknodo --quiet \ --chdir $log_dir --exec $binpath --pidfile $pidfile \ diff --git a/templates/protocols/bgp/node.def b/templates/protocols/bgp/node.def index 9a430834..27d29523 100644 --- a/templates/protocols/bgp/node.def +++ b/templates/protocols/bgp/node.def @@ -5,9 +5,7 @@ comp_help: \1 <1-4294967294>\tAS number syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 4294967294 ; \ "AS number must be between 1 and 4294967294" begin: sudo /opt/vyatta/sbin/quagga-manager start bgpd -# we need to set default parameters in BGP here since we can't do it in -# startup scripts as we don't know the AS number at that point -create: vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(@)" \ - -c "bgp network import-check" +create: vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(@)" delete: vyatta-vtysh -c "configure terminal" -c "no router bgp $VAR(@)" + |