diff options
| author |   Christian Heim <phreak@gentoo.org> | 2006-01-10 16:09:54 +0000 |
|---|---|---|
| committer | Christian Heim <phreak@gentoo.org> | 2006-01-10 16:09:54 +0000 |
| commit | 113f06ab1f0ed462ad37db2d10ec2ba0b4ecc400 (patch) | |
| tree | 0a0ad5220280ea5a3b020397900b3e5468338644 /net-scripts/net.modules.d/iwconfig | |
| parent | Fixing spelling :P (diff) | |
| download | baselayout-vserver-113f06ab1f0ed462ad37db2d10ec2ba0b4ecc400.tar.gz baselayout-vserver-113f06ab1f0ed462ad37db2d10ec2ba0b4ecc400.tar.bz2 baselayout-vserver-113f06ab1f0ed462ad37db2d10ec2ba0b4ecc400.zip | |
Importing the latest (r1798) changes uberlord made just before I've hit the commit button
svn path=/baselayout-vserver/trunk/; revision=200
Diffstat (limited to 'net-scripts/net.modules.d/iwconfig')
| -rw-r--r-- | net-scripts/net.modules.d/iwconfig | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/net-scripts/net.modules.d/iwconfig b/net-scripts/net.modules.d/iwconfig index 232cf0a..98c929e 100644 --- a/net-scripts/net.modules.d/iwconfig +++ b/net-scripts/net.modules.d/iwconfig @@ -244,7 +244,7 @@ iwconfig_setup_specific() { # Returns true if the AP MAC address is valid or not iwconfig_associate_mac() { # Checks if a MAC address has been assigned - local mac=$( iwconfig_get_ap_mac_address "$1" ) i + local mac="$( iwconfig_get_ap_mac_address $1 )" i local -a invalid_macs=( "00:00:00:00:00:00" "44:44:44:44:44:44" @@ -340,7 +340,8 @@ iwconfig_associate() { ESSIDVAR=$( bash_variable "${ESSID}" ) key=$( iwconfig_get_wep_key "${mac}" ) if [[ ${wep_required} == "on" && ${key} == "off" ]]; then - ewarn "WEP key is not set for \"${dessid}\"" + eerror "WEP key is not set for \"${dessid}\" - not connecting" + return 1 fi if [[ ${wep_required} == "off" && ${key} != "off" ]]; then key="off" @@ -429,7 +430,7 @@ iwconfig_scan() { fi # Set the essid to any. This is required for scanning - iwconfig "${iface}" essid any + #iwconfig "${iface}" essid any veinfo "Scanning for access points" |