Merge branch 'glendale' into hollywood

4 files changed, 42 insertions, 5 deletions

diff --git a/debian/changelog b/debian/changelog
index ffccaeb..e1076c5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,33 @@
+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 <mobrien@vyatta.com>  Sat, 19 Apr 2008 11:56:07 -0700
+
+vyatta-cfg (0.5) unstable; urgency=low
+
+  VC4.0.2 release candidate
+  [ Mark O'Brien ]
+
+
+  [ Stig Thormodsrud ]
+  * Fix 3034: Loopback interface controlled by "ethernet lo"
+
+  [ Mark O'Brien ]
+
+ -- Mark O'Brien <mobrien@vyatta.com>  Wed, 16 Apr 2008 09:50:08 -0700
+
 vyatta-cfg (0.4) unstable; urgency=low
 
   3.0.2
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");
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;
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.def b/templates/interfaces/ethernet/node.tag/vif/node.def
index 5374761..7ee3b50 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(../@)"