aboutsummaryrefslogtreecommitdiffstats
path: root/sysconfig/network-scripts/network-functions
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:39 -0500
commit4e96fcecee7ab70295a5f2c52748cd57cbab60bb (patch)
tree1f21e33041333fff2d0dd7a5fea65aa51906793f /sysconfig/network-scripts/network-functions
parent6091b58b60f532d8e3f317b99f7ea85d99853db3 (diff)
downloadinitscripts-4e96fcecee7ab70295a5f2c52748cd57cbab60bb.tar
initscripts-4e96fcecee7ab70295a5f2c52748cd57cbab60bb.tar.gz
initscripts-4e96fcecee7ab70295a5f2c52748cd57cbab60bb.tar.bz2
initscripts-4e96fcecee7ab70295a5f2c52748cd57cbab60bb.tar.xz
initscripts-4e96fcecee7ab70295a5f2c52748cd57cbab60bb.zip
Revert "Use sysfs rather than iwconfig for wireless check"
This reverts commit af401fb40f6dd5139e8468dfe1bd3dafe40e8e93. upstream removed sysfs wireless. How nice.
Diffstat (limited to 'sysconfig/network-scripts/network-functions')
-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 ()