pkg-release picks up changes outside of current branch apparently...

Revert "better solution for mendocino--removes patch from larkspur."

This reverts commit cea49c020969bc157982c56c3962ad5ae99dbc7f.

4 files changed, 40 insertions, 3 deletions

diff --git a/Makefile.am b/Makefile.am
index 4661a633..50e67f34 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,6 +11,7 @@ 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 61122341..4e19570a 100644
--- a/debian/vyatta-cfg-quagga.postinst
+++ b/debian/vyatta-cfg-quagga.postinst
@@ -1,4 +1,7 @@
 #!/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
new file mode 100755
index 00000000..cec82d7c
--- /dev/null
+++ b/scripts/vyatta-asn-first-cleanup.pl
@@ -0,0 +1,34 @@
+#!/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 bd7916eb..44319838 100644
--- a/templates/protocols/bgp/node.def
+++ b/templates/protocols/bgp/node.def
@@ -8,8 +8,7 @@ syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 4294967294 ; \
 		   "AS number must be between 1 and 4294967294"
 
 end: 
-
-if [ "$COMMIT_SIBLING_POSITION" = "FIRST" ] || \
-   [ "$COMMIT_SIBLING_POSITION" = "FIRSTLAST" ] ; then
+if [ ! -f "/tmp/protocols-bgp.$PPID" ]; then
+    touch /tmp/protocols-bgp.$PPID;
     /opt/vyatta/sbin/vyatta-bgp.pl --main
 fi;
\ No newline at end of file