From 2ae209526f843e33d27754f37a6e137300f96050 Mon Sep 17 00:00:00 2001
From: Tom Grennan <tgrennan@vyatta.com>
Date: Wed, 23 Jan 2008 15:29:56 -0800
Subject: Revert "only rescan interfaces if vyatta udev script is installed"

This reverts commit 85b14c8232b1e59ce9bb42bb69935f2349823b96.
---
 etc/init.d/vyatta-ofr | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/etc/init.d/vyatta-ofr b/etc/init.d/vyatta-ofr
index 21fcc36..5950651 100755
--- a/etc/init.d/vyatta-ofr
+++ b/etc/init.d/vyatta-ofr
@@ -108,12 +108,13 @@ start ()
 	chgrp ${GROUP} ${vyatta_configdir}
     log_action_end_msg $?
     init_bootfile
-    if [ -e /lib/udev/vyatta_net_name ] ; then
-	log_daemon_msg "Rescan Network Interfaces"
-	( udevtrigger --verbose --subsystem-match=net && udevsettle ) | \
-	    while read itf ; do log_progress_msg ${itf##*/} ; done
-	log_end_msg $?
-    fi
+    log_end_msg $?
+    log_daemon_msg "Rescan Network Interfaces"
+    ( udevtrigger --verbose --subsystem-match=net && udevsettle ) | \
+	while read itf ; do
+	    log_progress_msg ${itf##*/}
+	done
+    log_end_msg $?
     log_daemon_msg "Starting Vyatta Router"
     migrate_bootfile
     for s in ${subinit[@]} ; do
-- 
cgit v1.2.3


From d23b5fb020689aae6ae1407cbaaf713084072ddc Mon Sep 17 00:00:00 2001
From: Tom Grennan <tgrennan@vyatta.com>
Date: Wed, 23 Jan 2008 15:34:11 -0800
Subject: Revert "fix bug 2658"

This reverts commit 31d8f4539b68b3e65b0d98bce0d564705ffa1992.

Conflicts:

	etc/init.d/vyatta-ofr
---
 etc/init.d/vyatta-ofr | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/etc/init.d/vyatta-ofr b/etc/init.d/vyatta-ofr
index 5950651..2af4af5 100755
--- a/etc/init.d/vyatta-ofr
+++ b/etc/init.d/vyatta-ofr
@@ -108,13 +108,6 @@ start ()
 	chgrp ${GROUP} ${vyatta_configdir}
     log_action_end_msg $?
     init_bootfile
-    log_end_msg $?
-    log_daemon_msg "Rescan Network Interfaces"
-    ( udevtrigger --verbose --subsystem-match=net && udevsettle ) | \
-	while read itf ; do
-	    log_progress_msg ${itf##*/}
-	done
-    log_end_msg $?
     log_daemon_msg "Starting Vyatta Router"
     migrate_bootfile
     for s in ${subinit[@]} ; do
-- 
cgit v1.2.3


From 8ffbaca9efcee5c29a2d73b92a71d03359de48b1 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <stephen.hemminger@vyatta.com>
Date: Wed, 23 Jan 2008 19:04:18 -0800
Subject: allow setting 2500 or 10000 speed

Ethtool allows setting speed of 2.5Gb or 10Gb on devices that
support it.

Signed-off-by: Stephen Hemminger <stephen.hemminger@vyatta.com>
---
 templates/interfaces/ethernet/node.tag/speed/node.def | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/interfaces/ethernet/node.tag/speed/node.def b/templates/interfaces/ethernet/node.tag/speed/node.def
index bff2f08..652e498 100644
--- a/templates/interfaces/ethernet/node.tag/speed/node.def
+++ b/templates/interfaces/ethernet/node.tag/speed/node.def
@@ -1,7 +1,7 @@
 type: txt
 help: "Set the speed for this interface"
 default: "auto"
-syntax: $(@) in "auto", "10", "100", "1000"; "Speed must be auto, 10, 100, or 1000"
+syntax: $(@) in "auto", "10", "100", "1000", "2500", "10000"; "Speed must be auto, 10, 100, 1000, 2500, or 10000"
 commit: exec "if [ x$(@) != xauto ]; then \
 	         if [ x$(../duplex/@) == xauto ]; then \
                     exit 1; \
-- 
cgit v1.2.3


From 5c97a19976e400901b06b6784d767925e0893799 Mon Sep 17 00:00:00 2001
From: Tom Grennan <tgrennan@vyatta.com>
Date: Thu, 24 Jan 2008 11:42:08 -0800
Subject: dhcp3-client | vyatta-dhcp3-client

---
 debian/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index 3c48c3f..1d04e20 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Depends: bash (>= 3.1),
  coreutils (>= 5.97-5.3),
  vyatta-op,
  vyatta-config-migrate, 
- vyatta-dhcp3-client
+ dhcp3-client | vyatta-dhcp3-client
 Suggests: util-linux (>= 2.13-5),
  net-tools,
  ethtool,
-- 
cgit v1.2.3