One more fix (was Re: [RFC] [PATCH] Bonding support for dracut)

[Vladislav Bogdanov <bubble-Awb4OmSD/41iLUuM0BA3LQ@public.gmane.org>]

[-- Attachment #1: Type: text/plain, Size: 61 bytes --]

Hi,

one more patch with fixes is attached.

Best,
Vladislav

[-- Attachment #2: dracut-bonding-support-fixes.patch --]
[-- Type: text/x-patch, Size: 2845 bytes --]

diff --git a/modules.d/45ifcfg/write-ifcfg.sh b/modules.d/45ifcfg/write-ifcfg.sh
index 45fcde2..022467b 100755
--- a/modules.d/45ifcfg/write-ifcfg.sh
+++ b/modules.d/45ifcfg/write-ifcfg.sh
@@ -68,12 +68,13 @@ for netif in $IFACES ; do
         } >> /tmp/ifcfg/ifcfg-$netif
 
         for slave in $bondslaves ; do
+            # Set ONBOOT=no to prevent initscripts from trying to setup already bonded physical interface
             # write separate ifcfg file for the raw eth interface
             {
                 echo "# Generated by dracut initrd"
                 echo "DEVICE=$slave"
                 echo "TYPE=Ethernet"
-                echo "ONBOOT=yes"
+                echo "ONBOOT=no"
                 echo "NETBOOT=yes"
                 echo "HWADDR=$(cat /sys/class/net/$slave/address)"
                 echo "SLAVE=yes"
@@ -91,23 +92,24 @@ for netif in $IFACES ; do
         } >> /tmp/ifcfg/ifcfg-$netif
         if [ "$ethname" = "$bondname" ] ; then
             {
-                # This variable is an indicator of a bond interface for initscripts
+                # Set ONBOOT=no to prevent initscripts from trying to setup already bridged bond interface
                 echo "# Generated by dracut initrd"
                 echo "DEVICE=$bondname"
-                echo "ONBOOT=yes"
+                echo "ONBOOT=no"
                 echo "NETBOOT=yes"
+                # This variable is an indicator of a bond interface for initscripts
                 echo "BONDING_OPTS=\"$bondoptions\""
                 echo "BRIDGE=$netif"
                 echo "NAME=\"$bondname\"" 
             } >> /tmp/ifcfg/ifcfg-$bondname
             for slave in $bondslaves ; do
                 # write separate ifcfg file for the raw eth interface
-                # yes, duplicated code at this moment
+                # Set ONBOOT=no to prevent initscripts from trying to setup already bridged physical interface
                 {
                     echo "# Generated by dracut initrd"
                     echo "DEVICE=$slave"
                     echo "TYPE=Ethernet"
-                    echo "ONBOOT=yes"
+                    echo "ONBOOT=no"
                     echo "NETBOOT=yes"
                     echo "HWADDR=$(cat /sys/class/net/$slave/address)"
                     echo "SLAVE=yes"
@@ -121,11 +123,11 @@ for netif in $IFACES ; do
                 echo "# Generated by dracut initrd"
                 echo "DEVICE=$ethname"
                 echo "TYPE=Ethernet"
-                echo "ONBOOT=yes"
+                echo "ONBOOT=no"
                 echo "NETBOOT=yes"
                 echo "HWADDR=$(cat /sys/class/net/$ethname/address)"
                 echo "BRIDGE=$netif"
-                echo "NAME=$ethname" 
+                echo "NAME=$ethname"
             } >> /tmp/ifcfg/ifcfg-$ethname
         fi
     fi