From 6194a4338de8e612b925530265db0759a94814c4 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Thu, 28 Feb 2008 14:51:18 -0800 Subject: Read qos-policy before setting interface qos-policy Bugfix: 2914 Fix ordering of operations for qos-policy. --- scripts/VyattaConfigLoad.pm | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) (limited to 'scripts') diff --git a/scripts/VyattaConfigLoad.pm b/scripts/VyattaConfigLoad.pm index c09616d..a88d14d 100755 --- a/scripts/VyattaConfigLoad.pm +++ b/scripts/VyattaConfigLoad.pm @@ -9,16 +9,17 @@ use VyattaConfig; # configuration ordering. higher rank configured before lower rank. my $default_rank = 0; -my %config_rank = ( - 'interfaces' => 100, - 'interfaces bridge' => 99, - 'interfaces ethernet' => 98, - 'interfaces tunnel' => 91, - 'system' => 90, - 'protocols static' => 85, - 'service ssh' => 84, - 'service telnet' => 83, - ); +my %config_rank = ( + 'qos-policy' => 110, + 'interfaces' => 100, + 'interfaces bridge' => 99, + 'interfaces ethernet' => 98, + 'interfaces tunnel' => 91, + 'system' => 90, + 'protocols static' => 85, + 'service ssh' => 84, + 'service telnet' => 83, +); my @all_nodes = (); my @all_naked_nodes = (); -- cgit v1.2.3 From 1c2ea1480d6b5c1d7968fd04093dcfc254510ad1 Mon Sep 17 00:00:00 2001 From: Christopher Liljenstolpe Date: Tue, 4 Mar 2008 18:46:27 -0800 Subject: Fix 2954: IPv6 addresses that have a-f in the address fail. --- scripts/vyatta-interfaces.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripts') diff --git a/scripts/vyatta-interfaces.pl b/scripts/vyatta-interfaces.pl index fc10c4d..482faa8 100644 --- a/scripts/vyatta-interfaces.pl +++ b/scripts/vyatta-interfaces.pl @@ -358,7 +358,7 @@ sub is_valid_addr { } my ($addr, $net); - if ($addr_net =~ m/^([0-9\.\:]+)\/(\d+)$/) { + if ($addr_net =~ m/^([0-9a-fA-F\.\:]+)\/(\d+)$/) { $addr = $1; $net = $2; } else { -- cgit v1.2.3 From eee5bfc8b0d866eef2811b5f77917e05ee7bcee9 Mon Sep 17 00:00:00 2001 From: An-Cheng Huang Date: Thu, 6 Mar 2008 12:56:37 -0800 Subject: fix for bug 2950: raise config error messages during boot to warning level. --- scripts/vyatta-config-loader.pl | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'scripts') diff --git a/scripts/vyatta-config-loader.pl b/scripts/vyatta-config-loader.pl index 370a669..e2ecd99 100755 --- a/scripts/vyatta-config-loader.pl +++ b/scripts/vyatta-config-loader.pl @@ -14,6 +14,11 @@ if (!open(OLDOUT, ">&STDOUT") || !open(OLDERR, ">&STDERR") print STDERR "Cannot dup STDOUT/STDERR: $!\n"; exit 1; } + +if (!open(WARN, "|/usr/bin/logger -t config-loader -p local0.warning")) { + print OLDERR "Cannot open syslog: $!\n"; + exit 1; +} sub restore_fds { open(STDOUT, ">&OLDOUT"); @@ -35,7 +40,7 @@ my $CWRAPPER = '/opt/vyatta/sbin/vyatta-cfg-cmd-wrapper'; system("$CWRAPPER begin"); if ($? >> 8) { print OLDOUT "Cannot set up configuration environment\n"; - print STDOUT "Cannot set up configuration environment\n"; + print WARN "Cannot set up configuration environment\n"; restore_fds(); exit 1; } @@ -51,7 +56,7 @@ foreach (@all_nodes) { $ret = system("$commit_cmd"); if ($ret >> 8) { print OLDOUT "Commit failed at rank $cur_rank\n"; - print STDOUT "Commit failed at rank $cur_rank\n"; + print WARN "Commit failed at rank $cur_rank\n"; system("$cleanup_cmd"); # continue after cleanup (or should we abort?) } @@ -62,14 +67,14 @@ foreach (@all_nodes) { if ($ret >> 8) { $cmd =~ s/^.*?set /set /; print OLDOUT "[[$cmd]] failed\n"; - print STDOUT "[[$cmd]] failed\n"; + print WARN "[[$cmd]] failed\n"; # continue after set failure (or should we abort?) } } $ret = system("$commit_cmd"); if ($ret >> 8) { print OLDOUT "Commit failed at rank $cur_rank\n"; - print STDOUT "Commit failed at rank $cur_rank\n"; + print WARN "Commit failed at rank $cur_rank\n"; system("$cleanup_cmd"); # exit normally after cleanup (or should we exit with error?) } -- cgit v1.2.3