summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorStig Thormodsrud <stig@vyatta.com>2008-05-19 15:59:27 -0700
committerStig Thormodsrud <stig@vyatta.com>2008-05-19 15:59:27 -0700
commite1c9d6128c973f9f32a41cec4332734e32430178 (patch)
treedafdd578622c4a96a1857786762ba08b7ea4d585 /scripts
parentc859a613509619459122f5823e1764fef392f43a (diff)
downloadvyatta-cfg-e1c9d6128c973f9f32a41cec4332734e32430178.tar.gz
vyatta-cfg-e1c9d6128c973f9f32a41cec4332734e32430178.zip
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.
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/VyattaConfigLoad.pm40
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 = (