From 39f2c4e968b4578a33dd0ee55241fb042b2fdadb Mon Sep 17 00:00:00 2001 From: Mark O'Brien Date: Wed, 16 Apr 2008 09:50:08 -0700 Subject: VC4.0.2 --- debian/changelog | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/debian/changelog b/debian/changelog index ffccaeb..4318bf5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,16 @@ +vyatta-cfg (0.5) unstable; urgency=low + + VC4.0.2 + [ Mark O'Brien ] + + + [ Stig Thormodsrud ] + * Fix 3034: Loopback interface controlled by "ethernet lo" + + [ Mark O'Brien ] + + -- Mark O'Brien Wed, 16 Apr 2008 09:50:08 -0700 + vyatta-cfg (0.4) unstable; urgency=low 3.0.2 -- cgit v1.2.3 From fd5ebf6b81c2273ba77f66c7e9b17856b462ef01 Mon Sep 17 00:00:00 2001 From: Robert Bays Date: Fri, 18 Apr 2008 11:21:15 -0700 Subject: fix for bug 3177 --- templates/interfaces/ethernet/node.tag/vif/node.def | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/interfaces/ethernet/node.tag/vif/node.def b/templates/interfaces/ethernet/node.tag/vif/node.def index 73958be..6a367f6 100644 --- a/templates/interfaces/ethernet/node.tag/vif/node.def +++ b/templates/interfaces/ethernet/node.tag/vif/node.def @@ -5,7 +5,7 @@ syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 4094; "VLAN ID must be between 0 a create:expression: "sudo modprobe 8021q"; "Error loading 802.1q driver" create:expression: "sudo vconfig add $VAR(../@) $VAR(@)"; "Error adding VLAN id $VAR(@) to dev $VAR(../@)" create:expression: "sudo ip link set $VAR(../@).$VAR(@) up"; "Error enabling VLAN id $VAR(@) on dev $VAR(../@)" -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\"\ +create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\"\ -c \"interface $VAR(../@).$VAR(@)\" \ -c \"link-detect\"; " delete:expression: "sudo vconfig rem $VAR(../@).$VAR(@)"; "Error removing VLAN id $VAR(@) from dev $VAR(../@)" -- cgit v1.2.3 From 5617681dbb181b66d48164ec74d89f55e370a4d5 Mon Sep 17 00:00:00 2001 From: Stig Thormodsrud Date: Fri, 18 Apr 2008 12:10:56 -0700 Subject: If watchlink isn't running, don't treat it as a fatal error. --- scripts/vyatta-watchlink-exclude.pl | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/scripts/vyatta-watchlink-exclude.pl b/scripts/vyatta-watchlink-exclude.pl index eb9d280..b7a8916 100755 --- a/scripts/vyatta-watchlink-exclude.pl +++ b/scripts/vyatta-watchlink-exclude.pl @@ -89,7 +89,7 @@ sub remove_exclude_id { } } if ($match < 1) { - die "Error: no match found for $id"; + print "$0: no match found for $id"; } return @new_lines; } @@ -107,7 +107,7 @@ sub remove_exclude_line { } } if ($match < 1) { - die "Error: no match found for $remove_line"; + print "$0: no match found for $remove_line"; } return @new_lines; } @@ -172,7 +172,11 @@ write_exclude_file(@lines); if (defined $opt_signal) { if (! -e $watchlink_pid) { - die "Error: missing pid file [$watchlink_pid]\n"; + # + # watchlink may have been disabled, so don't treat + # this as an error + # + exit 0; } my $pid = `cat $watchlink_pid`; chomp $pid; -- cgit v1.2.3 From b0dd3c96c5e30077a602082c829d4bccf7795252 Mon Sep 17 00:00:00 2001 From: Robert Bays Date: Sat, 19 Apr 2008 11:10:39 -0700 Subject: cycle interface state on IP address assigment to fix static routes --- scripts/vyatta-interfaces.pl | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scripts/vyatta-interfaces.pl b/scripts/vyatta-interfaces.pl index 28b1c14..abbf6a8 100755 --- a/scripts/vyatta-interfaces.pl +++ b/scripts/vyatta-interfaces.pl @@ -319,7 +319,10 @@ sub update_eth_addrs { } if ($version == 4) { - return system("ip addr add $addr broadcast + dev $intf"); + # revert this gruesome hack when quagga static route initialization + # is fixed. + #return system("ip addr add $addr broadcast + dev $intf"); + return system("ip link set $intf down; ip link set $intf up; ip addr add $addr broadcast + dev $intf"); } if ($version == 6) { return system("ip -6 addr add $addr dev $intf"); -- cgit v1.2.3 From 29866c17c545126eadeb7b235668056801b811c9 Mon Sep 17 00:00:00 2001 From: Mark O'Brien Date: Sat, 19 Apr 2008 11:56:07 -0700 Subject: VC4.0.2 --- debian/changelog | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/debian/changelog b/debian/changelog index 4318bf5..56aa7f2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,20 @@ +vyatta-cfg (0.6) unstable; urgency=low + + VC4.0.2 + [ Mark O'Brien ] + + + [ Robert Bays ] + * fix for bug 3177 + * cycle interface state on IP address assigment to fix static routes + + [ Stig Thormodsrud ] + * If watchlink isn't running, don't treat it as a fatal error. + + [ Mark O'Brien ] + + -- Mark O'Brien Sat, 19 Apr 2008 11:56:07 -0700 + vyatta-cfg (0.5) unstable; urgency=low VC4.0.2 -- cgit v1.2.3 From 7fd560b72df1b327b4b47a6232dfcf16d6fae52c Mon Sep 17 00:00:00 2001 From: rbalocca Date: Mon, 21 Apr 2008 12:30:23 -0700 Subject: Indicate the VC4.0.2 release candidate in the changelog --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 56aa7f2..e1076c5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,7 +17,7 @@ vyatta-cfg (0.6) unstable; urgency=low vyatta-cfg (0.5) unstable; urgency=low - VC4.0.2 + VC4.0.2 release candidate [ Mark O'Brien ] -- cgit v1.2.3