diff options
| author | An-Cheng Huang <ancheng@vyatta.com> | 2008-01-24 14:15:48 -0800 |
|---|---|---|
| committer | An-Cheng Huang <ancheng@vyatta.com> | 2008-01-24 14:15:48 -0800 |
| commit | c0f8c1cbd9afc87ae76222024dd0e98127ca1708 (patch) | |
| tree | 07f9746a92f1eb4e199bd576fe3a5be36c8fe0d6 | |
| parent | ad567696c108bb68ec8fc3688020bbd92975d746 (diff) | |
| parent | 5c97a19976e400901b06b6784d767925e0893799 (diff) | |
| download | vyatta-cfg-c0f8c1cbd9afc87ae76222024dd0e98127ca1708.tar.gz vyatta-cfg-c0f8c1cbd9afc87ae76222024dd0e98127ca1708.zip | |
Merge branch 'glendale' of git.vyatta.com:/git/vyatta-cfg into glendale
| -rw-r--r-- | debian/control | 2 | ||||
| -rwxr-xr-x | etc/init.d/vyatta-ofr | 6 | ||||
| -rw-r--r-- | templates/interfaces/ethernet/node.tag/speed/node.def | 2 |
3 files changed, 2 insertions, 8 deletions
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, diff --git a/etc/init.d/vyatta-ofr b/etc/init.d/vyatta-ofr index 21fcc36..2af4af5 100755 --- a/etc/init.d/vyatta-ofr +++ b/etc/init.d/vyatta-ofr @@ -108,12 +108,6 @@ 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_daemon_msg "Starting Vyatta Router" migrate_bootfile for s in ${subinit[@]} ; do 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; \ |