diff options
Diffstat (limited to '')
| -rw-r--r-- | source/n/wireless_tools/scripts/rc.wireless (renamed from source/n/wireless-tools/scripts/rc.wireless) | 6 | ||||
| -rw-r--r-- | source/n/wireless_tools/scripts/rc.wireless.conf (renamed from source/n/wireless-tools/scripts/rc.wireless.conf) | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/source/n/wireless-tools/scripts/rc.wireless b/source/n/wireless_tools/scripts/rc.wireless index d1264a1fc..e7a35b893 100644 --- a/source/n/wireless-tools/scripts/rc.wireless +++ b/source/n/wireless_tools/scripts/rc.wireless @@ -47,7 +47,7 @@ # 16/apr/2008 * Pat Volkerding * Make sure that HWADDR is all upper case. # 23/apr/2008 * Pat Volkerding * Increase sleep time after bringing up an # interface to 3 seconds. Some drivers -# need this additional time to initialize. +# 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 @@ -84,7 +84,7 @@ done IWCOMMAND="$IWPATH/iwconfig ${INTERFACE}" IWPRIVCMD="$IWPATH/iwpriv ${INTERFACE}" IWSPYCMD="$IWPATH/iwspy ${INTERFACE}" -IFCOMMAND="/sbin/ifconfig ${INTERFACE}" +IFCOMMAND="/sbin/ip link set dev ${INTERFACE}" is_wireless_device () { @@ -124,7 +124,7 @@ $IFCOMMAND up sleep 3 # Get the MAC address for the interface -HWADDR=$(/sbin/ifconfig ${INTERFACE} | sed -ne 's/.*\(..:..:..:..:..:..\).*/\U\1/p') +HWADDR=$(/sbin/ip link show dev ${INTERFACE} | sed -ne 's/.*link\/ether \(..:..:..:..:..:..\).*/\U\1/p') # Empty all wireless parameters- some of them could still be set for a previous interface: # when rc.inet1 is sourced from rc.M all scripts are run in the same shell. diff --git a/source/n/wireless-tools/scripts/rc.wireless.conf b/source/n/wireless_tools/scripts/rc.wireless.conf index d02d7c2cc..5c611207c 100644 --- a/source/n/wireless-tools/scripts/rc.wireless.conf +++ b/source/n/wireless_tools/scripts/rc.wireless.conf @@ -6,7 +6,8 @@ # card inserted, the *first* block matching the card is used. # The address format is "hwaddr", with * as a wildcard. # 'hwaddr' is the unique MAC address identifier of the wireless card. -# The MAC address is usually printed on the card, or can be found via ifconfig. +# The MAC address is usually printed on the card, or can be found via +# "/sbin/ip link show dev $interface" # Some examples here use only half of the MAC address with a wildcard to # match a whole family of cards... # |