From 7800d646eb6af2a41b82f25bd2961bfaf1dd202e Mon Sep 17 00:00:00 2001
From: Stig Thormodsrud <stig@vyatta.com>
Date: Mon, 30 Jun 2008 15:31:24 -0700
Subject: Fix 3396: "commit failed at rank 800" while booting with bgp
 peer-group.

---
 scripts/VyattaConfigLoad.pm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'scripts')

diff --git a/scripts/VyattaConfigLoad.pm b/scripts/VyattaConfigLoad.pm
index 936a9cf..0e0c658 100755
--- a/scripts/VyattaConfigLoad.pm
+++ b/scripts/VyattaConfigLoad.pm
@@ -56,7 +56,8 @@ my %regex_rank = (
     'interfaces ethernet \S* vrrp'                  => 500,
     'interfaces ethernet \S* vif \S* vrrp'          => 500,
     'protocols bgp \d+ parameters'                  => 810,
-    'protocols bgp \d+ neighbor \S*[^\d.]\S*'       => 800,
+    'protocols bgp \d+ neighbor \d+\.\d+\.\d+\.\d+' => 800,
+    'protocols bgp \d+ neighbor \w+'                => 801,
 );
 
 my @all_nodes = ();
-- 
cgit v1.2.3