diff options
| author | Bill Nottingham <notting@redhat.com> | 2006-11-06 21:23:36 +0000 |
|---|---|---|
| committer | Bill Nottingham <notting@redhat.com> | 2006-11-06 21:23:36 +0000 |
| commit | 51d094cd26da397af64ee8dd82bb8dc822f18d0e (patch) | |
| tree | 508e42f7b29ee5699701b5e081a4106bad033b5f | |
| parent | a5ecbc33fbb7ac5b503906f60f5c717f14bbbcf6 (diff) | |
| download | initscripts-51d094cd26da397af64ee8dd82bb8dc822f18d0e.tar initscripts-51d094cd26da397af64ee8dd82bb8dc822f18d0e.tar.gz initscripts-51d094cd26da397af64ee8dd82bb8dc822f18d0e.tar.bz2 initscripts-51d094cd26da397af64ee8dd82bb8dc822f18d0e.tar.xz initscripts-51d094cd26da397af64ee8dd82bb8dc822f18d0e.zip | |
backport
| -rw-r--r-- | initscripts.spec | 2 | ||||
| -rw-r--r-- | sysconfig/network-scripts/network-functions | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/initscripts.spec b/initscripts.spec index 1a711812..3cbe34b1 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -193,6 +193,8 @@ rm -rf $RPM_BUILD_ROOT %ghost %attr(0664,root,utmp) /var/run/utmp %changelog +- don't automatically reload modules on module reomvals + * Fri Nov 3 2006 Bill Nottingham <notting@redhat.com> 8.45.9.EL-1 - fix ppc limits (#184820) - handle sinhalese as well (#212438) diff --git a/sysconfig/network-scripts/network-functions b/sysconfig/network-scripts/network-functions index 3fe8b73f..0342e40b 100644 --- a/sysconfig/network-scripts/network-functions +++ b/sysconfig/network-scripts/network-functions @@ -398,6 +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 |