summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorMichael Larson <slioch@eng-140.vyatta.com>2008-06-30 17:11:40 -0700
committerMichael Larson <slioch@eng-140.vyatta.com>2008-06-30 17:11:40 -0700
commit051d4e71597d7a8b947a9a9195167d63dc5dec50 (patch)
tree20f69be4a181924c3921fe1cd5d3b4e1260a2b25 /scripts
parent2eb529344218114f29d34e60f8485d18e49508ce (diff)
parent7800d646eb6af2a41b82f25bd2961bfaf1dd202e (diff)
downloadvyatta-cfg-051d4e71597d7a8b947a9a9195167d63dc5dec50.tar.gz
vyatta-cfg-051d4e71597d7a8b947a9a9195167d63dc5dec50.zip
Merge branch 'hollywood' of http://git.vyatta.com/vyatta-cfg into hollywood
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/VyattaConfigLoad.pm3
1 files changed, 2 insertions, 1 deletions
diff --git a/scripts/VyattaConfigLoad.pm b/scripts/VyattaConfigLoad.pm
index f1339c3..6f8a451 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 = ();