diff options
| author | imp <imp@FreeBSD.org> | 2001-09-13 06:18:07 +0000 |
|---|---|---|
| committer | imp <imp@FreeBSD.org> | 2001-09-13 06:18:07 +0000 |
| commit | d3c770d2d4e7c97490b535ab7fd4095ac6c62c22 (patch) | |
| tree | f156229909a45ef5c6cc46410f275712c511586c /etc | |
| parent | b9eed5024e7b0cf09825fd7364e32c6bbe022eee (diff) | |
| download | FreeBSD-src-d3c770d2d4e7c97490b535ab7fd4095ac6c62c22.zip FreeBSD-src-d3c770d2d4e7c97490b535ab7fd4095ac6c62c22.tar.gz | |
Due to a bug in the ed driver, which leads to hangs when using it with
dhclient and pccard_ether, introduce the concept of a "settle time" to
pccard_ether with the new pccard_ether_delay variable. Defaults to 5
seconds, which is enough time for the ed driver to finish its
autoconfiguration for newer Linksys based cards. This also can
eliminate the ed0: timeout messages that happen at startup as well.
MFC: after RE says OK.
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/defaults/rc.conf | 1 | ||||
| -rwxr-xr-x | etc/pccard_ether | 11 |
2 files changed, 12 insertions, 0 deletions
diff --git a/etc/defaults/rc.conf b/etc/defaults/rc.conf index f907501..5310643 100644 --- a/etc/defaults/rc.conf +++ b/etc/defaults/rc.conf @@ -29,6 +29,7 @@ pccard_beep="2" # pccard beep type. pccard_ifconfig="NO" # Specialized pccard ethernet configuration (or NO). pccardd_flags="" # Additional flags for pccardd. pccard_conf="/etc/defaults/pccard.conf" # pccardd(8) config file +pccard_ether_delay=5 # Delay before trying to start dhclient in pccard_ether removable_interfaces="" # Removable network interfaces for /etc/pccard_ether. local_startup="/usr/local/etc/rc.d /usr/X11R6/etc/rc.d" # startup script dirs. script_name_sep=" " # Change if your startup scripts' names contain spaces diff --git a/etc/pccard_ether b/etc/pccard_ether index d790a38..f6a0e61 100755 --- a/etc/pccard_ether +++ b/etc/pccard_ether @@ -46,6 +46,17 @@ shift startstop=$1 shift +case ${pccard_ether_delay} in +[Nn][Oo]) + ;; +[0-9]) + sleep ${pccard_ether_delay} + ;; +*) # Default until it has had a chance to make it to /etc/defaults/rc.conf + sleep 5 + ;; +esac + case ${pccard_ifconfig} in [Nn][Oo] | '') expr "${removable_interfaces}" : ".*${interface}" > /dev/null || exit 0 |
