diff options
| author | James Rayner <james@archlinux.org> | 2009-09-02 01:54:35 +0200 |
|---|---|---|
| committer | James Rayner <james@archlinux.org> | 2009-09-02 01:54:35 +0200 |
| commit | a14696d03dd23fac8d4c56058e8571049e0649dc (patch) | |
| tree | 2a71bfae53bc2168a797d7ce9f2ad0d4895fcf1a | |
| parent | 91f5c08bb60985769c0d74ed1f556284df0b91fd (diff) | |
| download | netctl-a14696d03dd23fac8d4c56058e8571049e0649dc.tar.gz netctl-a14696d03dd23fac8d4c56058e8571049e0649dc.tar.xz | |
Shorten find_ap/essid and allow net-profiles to continue if a profile fails
| -rw-r--r-- | src/net-profiles | 1 | ||||
| -rw-r--r-- | src/wireless | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/net-profiles b/src/net-profiles index 129aaed..ba75d56 100644 --- a/src/net-profiles +++ b/src/net-profiles @@ -51,7 +51,6 @@ case "$1" in add_daemon net-profiles exit 0 fi - break # found an enabled profile but failed to bring it up: exit for loop fi ;; esac diff --git a/src/wireless b/src/wireless index d3eb79c..2c9e681 100644 --- a/src/wireless +++ b/src/wireless @@ -16,7 +16,7 @@ wep_check() # Check if a particular network is within range # find_essid interface essid connection (we treat ESSID as regexp when CONNECTION=wireless-dbus) find_essid() { - local INTERFACE="$1" ESSID="$2" CONNECTION="$3" RETRIES=20 try=0 res scanned + local INTERFACE="$1" ESSID="$2" CONNECTION="$3" RETRIES=10 try=0 res scanned while [[ "$try" -lt "$RETRIES" ]]; do sleep 0.5 let try++ @@ -55,7 +55,7 @@ find_essid() { # Check if a particular network is within range # find_ap interface ap find_ap() { - local INTERFACE="$1" ap=$(echo "$2" | tr 'abcdef' 'ABCDEF') RETRIES=20 try=0 res scanned + local INTERFACE="$1" ap=$(echo "$2" | tr 'abcdef' 'ABCDEF') RETRIES=10 try=0 res scanned while [[ "$try" -lt "$RETRIES" ]]; do sleep 0.5 let try++ |