Attachment 151804 Details for Bug 232400 – anaconda-RHEL-5-kickstartNetworkUp.patch

[patch] anaconda-RHEL-5-kickstartNetworkUp.patch

anaconda-RHEL-5-kickstartNetworkUp.patch (text/plain), 1.75 KB, created by David Cantrell on 2007-04-05 19:34:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Cantrell

Created: 2007-04-05 19:34:17 UTC

Size: 1.75 KB

patch

obsolete

>Index: loader2/loader.c
>===================================================================
>RCS file: /usr/local/CVS/anaconda/loader2/loader.c,v
>retrieving revision 1.221.4.8
>diff -u -p -r1.221.4.8 loader.c
>--- loader2/loader.c	15 Jan 2007 20:13:12 -0000	1.221.4.8
>+++ loader2/loader.c	5 Apr 2007 19:30:22 -0000
>@@ -1100,8 +1100,16 @@ static char *doLoaderMain(char * locatio
>             setupNetworkDeviceConfig(&netDev, loaderData);
> 
>             rc = readNetConfig(devName, &netDev, loaderData->netCls, methodNum);
>-            loaderData->noipv4 = netDev.noipv4;
>-            loaderData->noipv6 = netDev.noipv6;
>+            if ((loaderData->noipv4 = netDev.noipv4) == 1)
>+                loaderData->ipinfo_set = 0;
>+            else
>+                loaderData->ipinfo_set = 1;
>+
>+            if ((loaderData->noipv6 = netDev.noipv6) == 1)
>+                loaderData->ipv6info_set = 0;
>+            else
>+                loaderData->ipv6info_set = 1;
>+
>             if ((rc == LOADER_BACK) || (rc == LOADER_ERROR) ||
>                 ((dir == -1) && (rc == LOADER_NOOP))) {
>                 step = STEP_IFACE;
>Index: loader2/net.c
>===================================================================
>RCS file: /usr/local/CVS/anaconda/loader2/net.c,v
>retrieving revision 1.119.4.7
>diff -u -p -r1.119.4.7 net.c
>--- loader2/net.c	5 Mar 2007 18:39:01 -0000	1.119.4.7
>+++ loader2/net.c	5 Apr 2007 19:30:23 -0000
>@@ -1796,6 +1796,10 @@ int kickstartNetworkUp(struct loaderData
>                        struct networkDeviceConfig *netCfgPtr) {
>     int rc;
> 
>+    /* we may have networking already, so return to the caller */
>+    if ((loaderData->ipinfo_set == 1) || (loaderData->ipv6info_set == 1))
>+        return 0;
>+
>     initLoopback();
> 
>     memset(netCfgPtr, 0, sizeof(*netCfgPtr));

Actions: View | Diff

Attachments on bug 232400: 151804