aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Nottingham <notting@redhat.com>2010-02-15 12:16:39 -0500
committerBill Nottingham <notting@redhat.com>2010-02-15 12:16:39 -0500
commit883a0608094c3bda0b5e0be8791bb388aa1f2d20 (patch)
tree6ac2e4e7ce9d0e7f17afe05496326227f15b56a9
parenta21eb994804e40f920d0e83afd2a4ec9b8c60c33 (diff)
downloadinitscripts-883a0608094c3bda0b5e0be8791bb388aa1f2d20.tar
initscripts-883a0608094c3bda0b5e0be8791bb388aa1f2d20.tar.gz
initscripts-883a0608094c3bda0b5e0be8791bb388aa1f2d20.tar.bz2
initscripts-883a0608094c3bda0b5e0be8791bb388aa1f2d20.tar.xz
initscripts-883a0608094c3bda0b5e0be8791bb388aa1f2d20.zip
Don't use ethtool to check for device w/bonding driver; just check that the passed device exists.
If they have a device that already exists but isn't a bond, the later add will fail anyway.
-rw-r--r--sysconfig/network-scripts/network-functions2
1 files changed, 1 insertions, 1 deletions
diff --git a/sysconfig/network-scripts/network-functions b/sysconfig/network-scripts/network-functions
index 61a9ee40..02a024a4 100644
--- a/sysconfig/network-scripts/network-functions
+++ b/sysconfig/network-scripts/network-functions
@@ -311,7 +311,7 @@ is_wireless_device ()
install_bonding_driver ()
{
- ethtool -i $1 2>/dev/null | grep -q "driver: bonding" && return 0
+ [ -d "/sys/class/net/$1" ] && return 0
[ ! -f /sys/class/net/bonding_masters ] && ( modprobe bonding || return 1 )
echo "+$1" > /sys/class/net/bonding_masters 2>/dev/null
return 0