Attachment 149596 Details for Bug 231290 – Patch to loader to handle loaderData->ip being NULL

[patch] Patch to loader to handle loaderData->ip being NULL

anaconda-11.2.0.31-loader.patch (text/plain), 1.97 KB, created by David Cantrell on 2007-03-08 17:35:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Cantrell

Created: 2007-03-08 17:35:35 UTC

Size: 1.97 KB

patch

obsolete

>Index: loader2/loader.c
>===================================================================
>RCS file: /usr/local/CVS/anaconda/loader2/loader.c,v
>retrieving revision 1.229
>diff -u -p -r1.229 loader.c
>--- loader2/loader.c	5 Mar 2007 22:03:19 -0000	1.229
>+++ loader2/loader.c	8 Mar 2007 17:26:56 -0000
>@@ -850,6 +850,7 @@ static char *doLoaderMain(char * locatio
>            STEP_DRIVERDISK, STEP_NETWORK, STEP_IFACE,
>            STEP_IP, STEP_URL, STEP_DONE } step;
>     char * url = NULL;
>+    char ret[48];
>     int dir = 1;
>     int rc, i;
> 
>@@ -1100,15 +1101,31 @@ static char *doLoaderMain(char * locatio
>             setupNetworkDeviceConfig(&netDev, loaderData);
> 
>             rc = readNetConfig(devName, &netDev, loaderData->netCls, methodNum);
>-            if ((loaderData->noipv4 = netDev.noipv4) == 1)
>+            if ((loaderData->noipv4 = netDev.noipv4) == 1) {
>                 loaderData->ipinfo_set = 0;
>-            else
>+            } else {
>+                if (netDev.isDynamic) {
>+                    loaderData->ip = strdup("dhcp");
>+                } else {
>+                    inet_ntop(AF_INET, IP_ADDR(&(netDev.dev.ipv4)), ret, IP_STRLEN(&(netDev.dev.ipv4)));
>+                    loaderData->ip = strdup(ret);
>+                }
>+
>                 loaderData->ipinfo_set = 1;
>+            }
> 
>-            if ((loaderData->noipv6 = netDev.noipv6) == 1)
>+            if ((loaderData->noipv6 = netDev.noipv6) == 1) {
>                 loaderData->ipv6info_set = 0;
>-            else
>+            } else {
>+                if (netDev.isDynamic) {
>+                    loaderData->ipv6 = strdup("dhcpv6");
>+                } else {
>+                    inet_ntop(AF_INET6, IP_ADDR(&(netDev.dev.ipv6)), ret, IP_STRLEN(&(netDev.dev.ipv6)));
>+                    loaderData->ipv6 = strdup(ret);
>+                }
>+
>                 loaderData->ipv6info_set = 1;
>+            }
> 
>             if ((rc == LOADER_BACK) || (rc == LOADER_ERROR) ||
>                 ((dir == -1) && (rc == LOADER_NOOP))) {

Actions: View | Diff

Attachments on bug 231290: 149596 | 149606 | 149613 | 149615