Merge branch 'hollywood' of git:/git/vyatta-cfg into hollywood

1 files changed, 21 insertions, 19 deletions

diff --git a/scripts/VyattaConfigLoad.pm b/scripts/VyattaConfigLoad.pm
index bf86e57..d202938 100755
--- a/scripts/VyattaConfigLoad.pm
+++ b/scripts/VyattaConfigLoad.pm
@@ -29,25 +29,27 @@ use VyattaConfig;
 # configuration ordering. higher rank configured before lower rank.
 my $default_rank = 0;
 my %config_rank  = (
-    'qos-policy'            => 1100,
-    'firewall'              => 1020,
-    'service nat'           => 1010,
-    'interfaces'            => 1000,
-    'interfaces bridge'     => 990,
-    'interfaces ethernet'   => 980,
-    'interfaces tunnel'     => 910,
-    'system gateway-address'=> 890,
-    'system name-server'    => 880,
-    'system login user'     => 870,
-    'system'                => 860,
-    'protocols static'      => 850,
-    'service ssh'           => 840,
-    'service telnet'        => 830,
-    'policy'                => 820,
-    'protocols bgp'         => 790,
-    'protocols ospf'        => 780,
-    'protocols rip'         => 770,
-    'vpn'                   => 600,
+    'qos-policy'                => 1100,
+    'firewall'                  => 1020,
+    'service nat'               => 1010,
+    'interfaces'                => 1000,
+    'interfaces bridge'         => 990,
+    'interfaces ethernet'       => 980,
+    'interfaces tunnel'         => 910,
+    'system gateway-address'    => 890,
+    'system name-server'        => 880,
+    'system login user'         => 870,
+    'system'                    => 860,
+    'protocols static'          => 850,
+    'service ssh'               => 840,
+    'service telnet'            => 830,
+    'policy'                    => 820,
+    'protocols bgp'             => 790,
+    'protocols ospf parameters' => 785,
+    'protocols ospf'            => 780,
+    'protocols rip'             => 770,
+    'vpn'                       => 600,
+
 );
 
 my %regex_rank = (