diff options
| -rw-r--r-- | src-wireless/netcfg-auto-wireless | 4 | ||||
| -rw-r--r-- | src/connections/wireless | 3 | ||||
| -rw-r--r-- | src/rfkill (renamed from src/wireless) | 15 | ||||
| -rwxr-xr-x | wpa_actiond/netcfg-wpa_actiond | 4 |
4 files changed, 5 insertions, 21 deletions
diff --git a/src-wireless/netcfg-auto-wireless b/src-wireless/netcfg-auto-wireless index 2bec32f..b915272 100644 --- a/src-wireless/netcfg-auto-wireless +++ b/src-wireless/netcfg-auto-wireless @@ -2,8 +2,8 @@ # Originally contributed by Neuro: http://bbs.archlinux.org/viewtopic.php?pid=278148#p278148 . /usr/lib/network/network -. /usr/lib/network/wireless -. /usr/lib/network/8021x +. $SUBR_DIR/rfkill +. $SUBR_DIR/8021x # wifi_auto # autoconnect wireless interface diff --git a/src/connections/wireless b/src/connections/wireless index 29d7cb2..9915165 100644 --- a/src/connections/wireless +++ b/src/connections/wireless @@ -1,8 +1,7 @@ #! /bin/bash . /usr/lib/network/network . $SUBR_DIR/8021x -. $SUBR_DIR/wireless - +. $SUBR_DIR/rfkill wireless_up() { diff --git a/src/wireless b/src/rfkill index 85743bf..d61703d 100644 --- a/src/wireless +++ b/src/rfkill @@ -1,18 +1,3 @@ -# Uses wireless_tools, to check for association to a network. -# wep_check interface [timeout] -wep_check() -{ - local INTERFACE="$1" TIMEOUT="${2:-15}" timeout=0 bssid - - while [[ $timeout -lt "$TIMEOUT" ]]; do - bssid=$(iwgetid "$INTERFACE" -ra) - [[ -n "$bssid" && "$bssid" != "00:00:00:00:00:00" ]] && return 0 - sleep 1 - let timeout++ - done - return 1 -} - set_rf_state() { local INTERFACE="$1" state="$2" RFKILL_NAME="$3" diff --git a/wpa_actiond/netcfg-wpa_actiond b/wpa_actiond/netcfg-wpa_actiond index 0e38518..e1b584a 100755 --- a/wpa_actiond/netcfg-wpa_actiond +++ b/wpa_actiond/netcfg-wpa_actiond @@ -1,7 +1,7 @@ #! /bin/bash . /usr/lib/network/network -. /usr/lib/network/8021x -. /usr/lib/network/wireless +. $SUBR_DIR/8021x +. $SUBR_DIR/rfkill AUTOWIFI="/usr/sbin/wpa_actiond" ACTION_SCRIPT="/usr/bin/netcfg-wpa_actiond-action" |