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-12 16:35:23 -0500
commit6548420e7155949e703d09519e54e364878f67bd (patch)
treed2d382c744337867a510e88895826af4766eb013
parentfb580ace2e92ca5b51b8d5e24c28c3ce2e00ee9c (diff)
downloadinitscripts-6548420e7155949e703d09519e54e364878f67bd.tar
initscripts-6548420e7155949e703d09519e54e364878f67bd.tar.gz
initscripts-6548420e7155949e703d09519e54e364878f67bd.tar.bz2
initscripts-6548420e7155949e703d09519e54e364878f67bd.tar.xz
initscripts-6548420e7155949e703d09519e54e364878f67bd.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 5b2f30ac..0b5b11d8 100644
--- a/sysconfig/network-scripts/network-functions
+++ b/sysconfig/network-scripts/network-functions
@@ -418,7 +418,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 ()