diff options
| author | Bill Nottingham <notting@redhat.com> | 2006-08-01 15:24:57 +0000 |
|---|---|---|
| committer | Bill Nottingham <notting@redhat.com> | 2006-08-01 15:24:57 +0000 |
| commit | dba091408c1301a44e50cc75a79429d26034c5fd (patch) | |
| tree | 4d1979f4348f8e3d2645b00c9dfc94a89197a95a | |
| parent | 4a292da5e8ffa349879b721cecfda856d5969c3a (diff) | |
| download | initscripts-dba091408c1301a44e50cc75a79429d26034c5fd.tar initscripts-dba091408c1301a44e50cc75a79429d26034c5fd.tar.gz initscripts-dba091408c1301a44e50cc75a79429d26034c5fd.tar.bz2 initscripts-dba091408c1301a44e50cc75a79429d26034c5fd.tar.xz initscripts-dba091408c1301a44e50cc75a79429d26034c5fd.zip | |
support LINKDELAY for dhcp (#191137)
| -rw-r--r-- | sysconfig.txt | 1 | ||||
| -rw-r--r-- | sysconfig/network-scripts/network-functions | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/sysconfig.txt b/sysconfig.txt index 3e770e88..04faaff5 100644 --- a/sysconfig.txt +++ b/sysconfig.txt @@ -679,7 +679,6 @@ Files in /etc/sysconfig/network-scripts/ enabled. This may be useful if one interface is connected to a switch which has spanning tree enabled and must wait for STP to converge before the interface should be considered usable. - Supported only with BOOTPROTO=none. BRIDGE=<br* device> If set, the ethernet device is not assigned an address. It is added to the specified bridge device instead. diff --git a/sysconfig/network-scripts/network-functions b/sysconfig/network-scripts/network-functions index ca2d802a..e60d704b 100644 --- a/sysconfig/network-scripts/network-functions +++ b/sysconfig/network-scripts/network-functions @@ -308,7 +308,9 @@ check_link_down () ip link set dev $1 up >/dev/null 2>&1 fi timeout=0 - while [ $timeout -le 10 ]; do + delay=10 + [ -n "$LINKDELAY" ] && delay=$(($LINKDELAY * 2)) + while [ $timeout -le $delay ]; do check_mii_tool $1 m=$? check_ethtool $1 |