From e1c9d6128c973f9f32a41cec4332734e32430178 Mon Sep 17 00:00:00 2001
From: Stig Thormodsrud <stig@vyatta.com>
Date: Mon, 19 May 2008 15:59:27 -0700
Subject: Force "protocols ospf parameters" to be committed before other ospf
 config. This should fix bug 3272 at boot time, but we still need to fix
 quagga so that it doesn't crash if router-id is changed during convergence.

---
 scripts/VyattaConfigLoad.pm | 40 +++++++++++++++++++++-------------------
 1 file 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 = (
-- 
cgit v1.2.3