diff options
Diffstat (limited to 'source/n/wireless-tools')
| -rw-r--r-- | source/n/wireless-tools/scripts/rc.wireless | 7 | ||||
| -rwxr-xr-x | source/n/wireless-tools/wireless_tools.SlackBuild | 16 |
2 files changed, 18 insertions, 5 deletions
diff --git a/source/n/wireless-tools/scripts/rc.wireless b/source/n/wireless-tools/scripts/rc.wireless index baa148dc7..5d5c4be5b 100644 --- a/source/n/wireless-tools/scripts/rc.wireless +++ b/source/n/wireless-tools/scripts/rc.wireless @@ -48,6 +48,11 @@ # 23/apr/2008 * Pat Volkerding * Increase sleep time after bringing up an # interface to 3 seconds. Some drivers # need this additional time to initalize. +# 02/jan/2010 * Pat Volkerding * Look for /sys/class/net/$NETDEV/wireless rather +# than the contents of /proc/net/wireless to find +# if a network device is wireless. In newer +# kernels devices will not show up in +# /proc/net/wireless until active. # ------------------------------------------------------------------------------ LOGGER=${LOGGER:-cat} @@ -82,7 +87,7 @@ is_wireless_device () #LC_ALL=C $IWPATH/iwconfig $1 2>&1 | \ # grep -Eiq "no wireless extensions|no such device" || return 0 #return 1 - if ! grep `echo ${1}: | cut -f 1 -d :`: /proc/net/wireless 1> /dev/null ; then + if [ ! -d /sys/class/net/${1}/wireless ]; then # no wireless interface return 1 else diff --git a/source/n/wireless-tools/wireless_tools.SlackBuild b/source/n/wireless-tools/wireless_tools.SlackBuild index 049fb47e0..2e78f0f9c 100755 --- a/source/n/wireless-tools/wireless_tools.SlackBuild +++ b/source/n/wireless-tools/wireless_tools.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,9 +22,17 @@ VERSION=29 -ARCH=${ARCH:-x86_64} -BUILD=${BUILD:-5} - +BUILD=${BUILD:-6} + +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i486 ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$( uname -m ) ;; + esac +fi if [ "$ARCH" = "x86_64" ]; then LIBDIRSUFFIX="64" |