aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Nottingham <notting@redhat.com>2012-11-12 16:35:23 -0500
committerBill Nottingham <notting@redhat.com>2012-11-15 17:07:06 -0500
commit19225a000d66d03353967fd7276f36b8c02f3358 (patch)
tree773627182287361855df2e85d18b32372475b84b
parent2800b44ef390d2c7cd868a3e6196752e90862651 (diff)
downloadinitscripts-19225a000d66d03353967fd7276f36b8c02f3358.tar
initscripts-19225a000d66d03353967fd7276f36b8c02f3358.tar.gz
initscripts-19225a000d66d03353967fd7276f36b8c02f3358.tar.bz2
initscripts-19225a000d66d03353967fd7276f36b8c02f3358.tar.xz
initscripts-19225a000d66d03353967fd7276f36b8c02f3358.zip
Revert "Use sysfs rather than iwconfig for wireless check"
This reverts commit af401fb40f6dd5139e8468dfe1bd3dafe40e8e93. upstream removed sysfs wireless. How nice.
-rw-r--r--sysconfig/network-scripts/network-functions4
1 files changed, 3 insertions, 1 deletions
diff --git a/sysconfig/network-scripts/network-functions b/sysconfig/network-scripts/network-functions
index 7d4edd9f..6598060f 100644
--- a/sysconfig/network-scripts/network-functions
+++ b/sysconfig/network-scripts/network-functions
@@ -391,7 +391,9 @@ add_default_route ()
is_wireless_device ()
{
- [ -d "/sys/class/net/$1/wireless" ]
+ [ -x /sbin/iwconfig ] || return 1
+ LC_ALL=C iwconfig $1 2>&1 | grep -q "no wireless extensions" || return 0
+ return 1
}
install_bonding_driver ()