Attachment 921146 Details for Bug 1123552 – Copy of proposed patch / pull request on GitHub

[patch] Copy of proposed patch / pull request on GitHub

dracut-45ifcfg-bridge.patch (text/plain), 3.12 KB, created by Alex Harpin on 2014-07-26 10:31:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Harpin

Created: 2014-07-26 10:31:27 UTC

Size: 3.12 KB

patch

obsolete

>From 2bdbcf04c94a106a07acbe4b11f44821d8546426 Mon Sep 17 00:00:00 2001
>From: Alex Harpin <development@landsofshadow.co.uk>
>Date: Sat, 26 Jul 2014 11:13:03 +0100
>Subject: [PATCH] bridging: generate ifcfg files for both the bridge and
> interfaces
>
>When a bridged interface is configured to start up on boot via the
>kernel command line options, the resulting ifcfg files produced by
>the 45ifcfg dracut module are incorrect.  Atlthough the interface is
>brought up correctly on start up, and functions as expected, when the
>configuration file is imported into the booted system it prevents the
>bridged interface from being successfully restarted.
>
>This patch rewrites the section of 45ifcfg responsible for the creation
>of the required ifcfg files.
>
>Bug #1123552 https://bugzilla.redhat.com/show_bug.cgi?id=1123552
>---
> modules.d/45ifcfg/write-ifcfg.sh | 35 ++++++-----------------------------
> 1 file changed, 6 insertions(+), 29 deletions(-)
>
>diff --git a/modules.d/45ifcfg/write-ifcfg.sh b/modules.d/45ifcfg/write-ifcfg.sh
>index 7e301de..c2e565c 100755
>--- a/modules.d/45ifcfg/write-ifcfg.sh
>+++ b/modules.d/45ifcfg/write-ifcfg.sh
>@@ -224,33 +224,9 @@ for netup in /tmp/net.*.did-setup ; do
>             echo "TYPE=Bridge"
>             echo "NAME=\"$netif\""
>         } >> /tmp/ifcfg/ifcfg-$netif
>-        if [ "$ethname" = "$bondname" ] ; then
>-            {
>-                echo "# Generated by dracut initrd"
>-                echo "DEVICE=\"$bondname\""
>-                echo "ONBOOT=yes"
>-                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
>-                {
>-                    echo "# Generated by dracut initrd"
>-                    echo "DEVICE=\"$slave\""
>-                    echo "TYPE=Ethernet"
>-                    echo "ONBOOT=yes"
>-                    echo "NETBOOT=yes"
>-                    echo "HWADDR=\"$(cat /sys/class/net/$slave/address)\""
>-                    echo "SLAVE=yes"
>-                    echo "MASTER=\"$bondname\""
>-                    echo "NAME=\"$slave\""
>-                } >> /tmp/ifcfg/ifcfg-$slave
>-            done
>-        else
>-            # write separate ifcfg file for the raw eth interface
>+
>+        for ethname in $ethnames ; do
>+            # write separate ifcfg file for the raw eth interface(s)
>             {
>                 echo "# Generated by dracut initrd"
>                 echo "DEVICE=\"$ethname\""
>@@ -260,9 +236,10 @@ for netup in /tmp/net.*.did-setup ; do
>                 echo "HWADDR=\"$(cat /sys/class/net/$ethname/address)\""
>                 echo "BRIDGE=\"$netif\""
>                 echo "NAME=\"$ethname\""
>-            } >> /tmp/ifcfg/ifcfg-$ethname
>-        fi
>+            } > /tmp/ifcfg/ifcfg-$ethname
>+        done
>     fi
>+
>     i=1
>     for ns in $(getargs nameserver); do
>         echo "DNS${i}=\"${ns}\"" >> /tmp/ifcfg/ifcfg-$netif
>-- 
>1.9.3
>

Actions: View | Diff

Attachments on bug 1123552: 921146