diff options
| author | Michael Larson <mike@vyatta.com> | 2010-11-18 16:45:04 -0800 |
|---|---|---|
| committer | Michael Larson <mike@vyatta.com> | 2010-11-18 16:45:04 -0800 |
| commit | cea49c020969bc157982c56c3962ad5ae99dbc7f (patch) | |
| tree | 61ad0cd14eb826edf4df46329ce3e75c186ab458 | |
| parent | 0a463cf993293f52358f5e32d0828a6245033f18 (diff) | |
| download | vyatta-cfg-quagga-cea49c020969bc157982c56c3962ad5ae99dbc7f.tar.gz vyatta-cfg-quagga-cea49c020969bc157982c56c3962ad5ae99dbc7f.zip | |
better solution for mendocino--removes patch from larkspur.
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rw-r--r-- | debian/vyatta-cfg-quagga.postinst | 3 | ||||
| -rwxr-xr-x | scripts/vyatta-asn-first-cleanup.pl | 34 | ||||
| -rw-r--r-- | templates/protocols/bgp/node.def | 5 |
4 files changed, 3 insertions, 40 deletions
diff --git a/Makefile.am b/Makefile.am index 50e67f34..4661a633 100644 --- a/Makefile.am +++ b/Makefile.am @@ -11,7 +11,6 @@ sbin_SCRIPTS += scripts/policy/vyatta-check-as-prepend.pl sbin_SCRIPTS += scripts/vyatta-policy-action-verify.pl sbin_SCRIPTS += scripts/vyatta-gateway-static_route-check.pl sbin_SCRIPTS += scripts/vyatta-link-detect -sbin_SCRIPTS += scripts/vyatta-asn-first-cleanup.pl sbin_PROGRAMS = src/check_prefix_boundary diff --git a/debian/vyatta-cfg-quagga.postinst b/debian/vyatta-cfg-quagga.postinst index 4e19570a..61122341 100644 --- a/debian/vyatta-cfg-quagga.postinst +++ b/debian/vyatta-cfg-quagga.postinst @@ -1,7 +1,4 @@ #!/bin/bash -mkdir -p /etc/commit -ln -s /opt/vyatta/sbin/vyatta-asn-first-cleanup.pl /etc/commit/vyatta-asn-first-cleanup.pl 2>/dev/null - exit 0 diff --git a/scripts/vyatta-asn-first-cleanup.pl b/scripts/vyatta-asn-first-cleanup.pl deleted file mode 100755 index cec82d7c..00000000 --- a/scripts/vyatta-asn-first-cleanup.pl +++ /dev/null @@ -1,34 +0,0 @@ -#!/usr/bin/perl -# Module: vyatta-asn-first-cleanup.pl -# -# **** License **** -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License version 2 as -# published by the Free Software Foundation. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# A copy of the GNU General Public License is available as -# `/usr/share/common-licenses/GPL' in the Debian GNU/Linux distribution -# or on the World Wide Web at `http://www.gnu.org/copyleft/gpl.html'. -# You can also obtain it by writing to the Free Software Foundation, -# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, -# MA 02110-1301, USA. -# -# This code was originally developed by Vyatta, Inc. -# Portions created by Vyatta are Copyright (C) 2008 Vyatta, Inc. -# All Rights Reserved. -# -# Author: Michael Larson -# Date: June 2008 -# Description: Removes file at end of asn node visitation -# **** End License **** - -use strict; -use warnings; -use lib "/opt/vyatta/share/perl5/"; - -`rm -f /tmp/protocols-bgp.*`; diff --git a/templates/protocols/bgp/node.def b/templates/protocols/bgp/node.def index 44319838..bd7916eb 100644 --- a/templates/protocols/bgp/node.def +++ b/templates/protocols/bgp/node.def @@ -8,7 +8,8 @@ syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 4294967294 ; \ "AS number must be between 1 and 4294967294" end: -if [ ! -f "/tmp/protocols-bgp.$PPID" ]; then - touch /tmp/protocols-bgp.$PPID; + +if [ "$COMMIT_SIBLING_POSITION" = "FIRST" ] || \ + [ "$COMMIT_SIBLING_POSITION" = "FIRSTLAST" ] ; then /opt/vyatta/sbin/vyatta-bgp.pl --main fi;
\ No newline at end of file |