aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAshish Samant <ashish.samant@oracle.com>2014-10-29 17:47:29 -0700
committerLukas Nykryn <lnykryn@redhat.com>2014-12-08 13:28:14 +0100
commit30ecd15eb772de10f9c2f94cc9bad4eac5439d24 (patch)
tree196f663fdc7b90461dcac561e833f54c5a560b2c
parent14384d32551f2b0cc83566f602ad3ceb0b02094e (diff)
downloadinitscripts-30ecd15eb772de10f9c2f94cc9bad4eac5439d24.tar
initscripts-30ecd15eb772de10f9c2f94cc9bad4eac5439d24.tar.gz
initscripts-30ecd15eb772de10f9c2f94cc9bad4eac5439d24.tar.bz2
initscripts-30ecd15eb772de10f9c2f94cc9bad4eac5439d24.tar.xz
initscripts-30ecd15eb772de10f9c2f94cc9bad4eac5439d24.zip
improve_check_for_bond_master_in_install_bonding_driver
The current grep check (fgrep -sqx) in install_bonding_driver, to determine whether bond master exists, fails when there are multiple bond masters. The fix assumes that multiple bond masters are on different lines in the file "/sys/class/net/bonding_masters", while they are in fact on the same line. Since fgrep -sqx checks for the entire line,it will never match any one bond master within the line and always fail if there are multiple bonds. This patch improves the check by creating a new function, bond_master_exists() to handle this and other conditions. Orabug: 19897586 Signed-off-by: Ashish Samant <ashish.samant@oracle.com> Signed-off-by: John Haxby <john.haxby@oracle.com> Acked-by: Mukesh Kacker <mukesh.kacker@oracle.com>
-rw-r--r--sysconfig/network-scripts/network-functions16
1 files changed, 14 insertions, 2 deletions
diff --git a/sysconfig/network-scripts/network-functions b/sysconfig/network-scripts/network-functions
index 0e86efd0..e6273bb6 100644
--- a/sysconfig/network-scripts/network-functions
+++ b/sysconfig/network-scripts/network-functions
@@ -458,10 +458,22 @@ phy_wireless_device ()
cat /sys/class/net/$1/phy80211/name
}
+bond_master_exists ()
+{
+ local bond_name
+ [ -z "${1}" ] && return 1
+ [ ! -f /sys/class/net/bonding_masters ] && return 1
+
+ for bond_name in $(< /sys/class/net/bonding_masters); do
+ [ "${bond_name}" == "${1}" ] && return 0
+ done
+ return 1
+}
+
install_bonding_driver ()
{
- [ ! -f /sys/class/net/bonding_masters ] && ( modprobe bonding || return 1 )
- if ! fgrep -sqx "$1" /sys/class/net/bonding_masters; then
+ if ! bond_master_exists ${1}; then
+ modprobe bonding || return 1
echo "+$1" > /sys/class/net/bonding_masters 2>/dev/null
fi
(