Attachment 654378 Details for Bug 880451 – Proposed patch

[patch] Proposed patch

dracut-multiple-bonding.patch (text/plain), 3.83 KB, created by Harald Hoyer on 2012-11-29 15:53:50 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Harald Hoyer

Created: 2012-11-29 15:53:50 UTC

Size: 3.83 KB

patch

obsolete

>commit 14b4d8e4ea772d77a79911c43110840a29e29f31
>Author: Harald Hoyer <harald@redhat.com>
>Date:   Thu Nov 29 16:52:44 2012 +0100
>
>    network: support multiple bonding interfaces
>
>diff --git a/modules.d/40network/ifup.sh b/modules.d/40network/ifup.sh
>index 2e83444..a539dc6 100755
>--- a/modules.d/40network/ifup.sh
>+++ b/modules.d/40network/ifup.sh
>@@ -19,14 +19,18 @@ type ip_to_var >/dev/null 2>&1 || . /lib/net-lib.sh
> netif=$1
> 
> # enslave this interface to bond?
>-if [ -e /tmp/bond.info ]; then
>-    . /tmp/bond.info
>+for i in /tmp/bond.*.info; do
>+    [ -e "$i" ] || continue
>+    unset bondslaves
>+    unset bondname
>+    . "$i"
>     for slave in $bondslaves ; do
>         if [ "$netif" = "$slave" ] ; then
>             netif=$bondname
>+            break 2
>         fi
>     done
>-fi
>+done
> 
> if [ -e /tmp/team.info ]; then
>     . /tmp/team.info
>@@ -130,11 +134,12 @@ if [ "$netif" = "lo" ] ; then
> fi
> 
> # start bond if needed
>-if [ -e /tmp/bond.info ]; then
>-    . /tmp/bond.info
>+if [ -e /tmp/bond.${netif}.info ]; then
>+    . /tmp/bond.${netif}.info
> 
>     if [ "$netif" = "$bondname" ] && [ ! -e /tmp/net.$bondname.up ] ; then # We are master bond device
>         modprobe bonding
>+        echo "+$netif" >  /sys/class/net/bonding_masters
>         ip link set $netif down
> 
>         # Stolen from ifup-eth
>diff --git a/modules.d/40network/net-genrules.sh b/modules.d/40network/net-genrules.sh
>index 4ede10f..06c6927 100755
>--- a/modules.d/40network/net-genrules.sh
>+++ b/modules.d/40network/net-genrules.sh
>@@ -30,11 +30,14 @@ fi
>     fi
> 
>     # bond: attempt only the defined interface (override bridge defines)
>-    if [ -e /tmp/bond.info ]; then
>-        . /tmp/bond.info
>+    for i in /tmp/bond.*.info; do
>+        [ -e "$i" ] || continue
>+        unset bondslaves
>+        unset bondname
>+        . "$i"
>         # It is enough to fire up only one
>         IFACES+=" ${bondslaves%% *}"
>-    fi
>+    done
> 
>     if [ -e /tmp/team.info ]; then
>         . /tmp/team.info
>diff --git a/modules.d/40network/parse-bond.sh b/modules.d/40network/parse-bond.sh
>index 983eb3a..25c51b8 100755
>--- a/modules.d/40network/parse-bond.sh
>+++ b/modules.d/40network/parse-bond.sh
>@@ -54,8 +54,8 @@ if getarg bond >/dev/null; then
>     fi
>     # Make it suitable for initscripts export
>     bondoptions=$(str_replace "$bondoptions" ";" ",")
>-    echo "bondname=$bondname" > /tmp/bond.info
>-    echo "bondslaves=\"$bondslaves\"" >> /tmp/bond.info
>-    echo "bondoptions=\"$bondoptions\"" >> /tmp/bond.info
>+    echo "bondname=$bondname" > /tmp/bond.${bondname}.info
>+    echo "bondslaves=\"$bondslaves\"" >> /tmp/bond.${bondname}.info
>+    echo "bondoptions=\"$bondoptions\"" >> /tmp/bond.${bondname}.info
>     return
> fi
>diff --git a/modules.d/40network/parse-bridge.sh b/modules.d/40network/parse-bridge.sh
>index 1f027bb..8c305c0 100755
>--- a/modules.d/40network/parse-bridge.sh
>+++ b/modules.d/40network/parse-bridge.sh
>@@ -37,12 +37,6 @@ parsebridge() {
> unset bridgename ethnames
> 
> iface=eth0
>-if [ -e /tmp/bond.info ]; then
>-    . /tmp/bond.info
>-    if [ -n "$bondname" ] ; then
>-        iface=$bondname
>-    fi
>-fi
> 
> # Parse bridge for bridgename and ethnames
> if bridge="$(getarg bridge)"; then
>diff --git a/modules.d/45ifcfg/write-ifcfg.sh b/modules.d/45ifcfg/write-ifcfg.sh
>index ae37358..57dbe60 100755
>--- a/modules.d/45ifcfg/write-ifcfg.sh
>+++ b/modules.d/45ifcfg/write-ifcfg.sh
>@@ -9,10 +9,6 @@ udevadm settle --timeout=30
> 
> read IFACES < /tmp/net.ifaces
> 
>-if [ -e /tmp/bond.info ]; then
>-    . /tmp/bond.info
>-fi
>-
> if [ -e /tmp/bridge.info ]; then
>     . /tmp/bridge.info
> fi
>@@ -89,6 +85,11 @@ for netif in $IFACES ; do
>     # bridge?
>     unset bridge
>     unset bond
>+    unset bondslaves
>+    unset bondname
>+    unset bondoptions
>+    [ -e /tmp/bond.${netif}.info ] && . /tmp/bond.${netif}.info
>+
>     uuid=$(cat /proc/sys/kernel/random/uuid)
>     if [ "$netif" = "$bridgename" ]; then
>         bridge=yes

Actions: View | Diff

Attachments on bug 880451: 654378