summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRick Balocca <rbalocca@vyatta.com>2008-07-23 17:01:19 -0700
committerRick Balocca <rbalocca@vyatta.com>2008-07-23 17:01:19 -0700
commite95fb343a63b8cb6c1dc10fe30b5b1c3cafecc2a (patch)
treef1cacc6ae822bed137b0002749b58e01938897ce
parent894b2b4744aa3e091bcbe0a883e3e0f6715fb11d (diff)
parent29893263e30fe77bcc5b3ef2317430f772d0b717 (diff)
downloadvyatta-cfg-e95fb343a63b8cb6c1dc10fe30b5b1c3cafecc2a.tar.gz
vyatta-cfg-e95fb343a63b8cb6c1dc10fe30b5b1c3cafecc2a.zip
Merge branch 'hollywood' into islavista
-rwxr-xr-xscripts/VyattaConfigLoad.pm1
1 files changed, 1 insertions, 0 deletions
diff --git a/scripts/VyattaConfigLoad.pm b/scripts/VyattaConfigLoad.pm
index 71203be..b1b7598 100755
--- a/scripts/VyattaConfigLoad.pm
+++ b/scripts/VyattaConfigLoad.pm
@@ -56,6 +56,7 @@ my %config_rank = (
my %regex_rank = (
'interfaces ethernet \S* vrrp' => 500,
'interfaces ethernet \S* vif \S* vrrp' => 500,
+ 'interfaces ethernet \S* pppo[ea]' => 400,
'protocols bgp \d+ parameters' => 810,
'protocols bgp \d+ neighbor \d+\.\d+\.\d+\.\d+' => 800,
'protocols bgp \d+ neighbor \w+' => 801,