From 883a0608094c3bda0b5e0be8791bb388aa1f2d20 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Mon, 15 Feb 2010 12:16:39 -0500 Subject: 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. --- sysconfig/network-scripts/network-functions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- cgit v1.2.1