summaryrefslogtreecommitdiffstats
path: root/src/connections
diff options
context:
space:
mode:
authorJames Rayner <james@archlinux.org>2009-02-17 02:16:33 +0100
committerJames Rayner <james@archlinux.org>2009-02-17 02:16:33 +0100
commit5955232eeb8e5d55d9c41c8bc60d058ebbc2ded9 (patch)
tree1d5e1bd9e3cc4f3af8e0bc7cc89c24ebf2d43851 /src/connections
parent11646867bc735d89cdc95508f30fa4277592bbfe (diff)
downloadnetctl-5955232eeb8e5d55d9c41c8bc60d058ebbc2ded9.tar.gz
netctl-5955232eeb8e5d55d9c41c8bc60d058ebbc2ded9.tar.xz
fix netcfg-auto-wireless and a temporary workaround for FS#13299
Diffstat (limited to 'src/connections')
-rw-r--r--src/connections/wireless8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/connections/wireless b/src/connections/wireless
index f521465..27df7ca 100644
--- a/src/connections/wireless
+++ b/src/connections/wireless
@@ -62,11 +62,11 @@ wireless_up() {
quirk "postscan" && sleep 1 && iwlist $INTERFACE scan &>/dev/null
quirk "predown" && ifconfig $INTERFACE up
- # Some devices appear to not associate until DHCP is run.
- if quirk "noacheck"; then
- sleep ${WIRELESS_TIMEOUT:-20}
- else
+ # Many devices appear to not associate until DHCP is run.
+ if quirk "acheck"; then
wep_check $INTERFACE $TIMEOUT|| return 1
+ else
+ sleep ${TIMEOUT:-15}
fi
;;
wpa)