From 1b562d23206b761a0002192d423cf8e9140b061d Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@redhat.com>
Date: Tue, 23 Jan 2007 17:38:29 +0000
Subject: simplify bonding test (#215887, <herbert.xu@redhat.com>)

---
 sysconfig/network-scripts/network-functions | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'sysconfig/network-scripts/network-functions')

diff --git a/sysconfig/network-scripts/network-functions b/sysconfig/network-scripts/network-functions
index 0342e40b..5791c611 100644
--- a/sysconfig/network-scripts/network-functions
+++ b/sysconfig/network-scripts/network-functions
@@ -398,10 +398,7 @@ install_bonding_driver ()
 
 is_bonding_device ()
 {
-   [ ! -d "/sys/class/net/$1" ] && return 1
-   [ "${TYPE}" = "Bonding" ] && return 0
-   ethtool -i $1 2>/dev/null | grep -q "driver: bonding" && return 0
-   return 1
+   [ -f "/sys/class/net/$1/bonding/slaves" ]
 }
 
 # Invoke this when /etc/resolv.conf has changed:
-- 
cgit v1.2.1