diff options
| author | Bill Nottingham <notting@redhat.com> | 2007-06-22 21:14:42 +0000 |
|---|---|---|
| committer | Bill Nottingham <notting@redhat.com> | 2007-06-22 21:14:42 +0000 |
| commit | 11784c118fe09379ec13cd9bbd00d60f98291d87 (patch) | |
| tree | 078563dcff7c4011f60bcfa73f7c788e015e8f11 | |
| parent | 7ed132f392bf35527b9e2a0de18fa99c75a2f414 (diff) | |
| download | initscripts-11784c118fe09379ec13cd9bbd00d60f98291d87.tar initscripts-11784c118fe09379ec13cd9bbd00d60f98291d87.tar.gz initscripts-11784c118fe09379ec13cd9bbd00d60f98291d87.tar.bz2 initscripts-11784c118fe09379ec13cd9bbd00d60f98291d87.tar.xz initscripts-11784c118fe09379ec13cd9bbd00d60f98291d87.zip | |
- fix logic error in install_bonding_driver (#229643)
| -rw-r--r-- | initscripts.spec | 1 | ||||
| -rw-r--r-- | sysconfig/network-scripts/network-functions | 7 |
2 files changed, 3 insertions, 5 deletions
diff --git a/initscripts.spec b/initscripts.spec index 826b8fae..894a9c81 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -197,6 +197,7 @@ rm -rf $RPM_BUILD_ROOT %changelog * Fri Jun 22 2007 Bill Nottingham <notting@redhat.com> 8.45.16.EL-1 - add support for VLAN_PLUS_VID_NO_PAD vlans (#229285) +- fix logic error in install_bonding_driver (#229643) * Mon Jan 15 2007 Bill Nottingham <notting@redhat.com> 8.45.14.EL-1 - set MACADDR, if specified, before bringing up bonding master/slaves (#218792) diff --git a/sysconfig/network-scripts/network-functions b/sysconfig/network-scripts/network-functions index 0342e40b..9ef2134c 100644 --- a/sysconfig/network-scripts/network-functions +++ b/sysconfig/network-scripts/network-functions @@ -391,17 +391,14 @@ is_wireless_device () install_bonding_driver () { ethtool -i $1 2>/dev/null | grep -q "driver: bonding" && return 0 - [ ! -f /sys/class/net/bonding_masters ] && modprobe bonding || return 1 + [ ! -f /sys/class/net/bonding_masters ] && ( modprobe bonding || return 1 ) echo "+$1" > /sys/class/net/bonding_masters return 0 } 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: |