Attachment 269681 Details for Bug 189795 – Add dhcptimeout parameter to loader

[patch] Add dhcptimeout parameter to loader

dhcptimeout-rhel4.patch (text/plain), 2.35 KB, created by Martin Sivák on 2007-11-27 12:04:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Sivák

Created: 2007-11-27 12:04:26 UTC

Size: 2.35 KB

patch

obsolete

>diff --git a/loader2/loader.c b/loader2/loader.c
>index 7b9b44d..ed0d56e 100644
>--- a/loader2/loader.c
>+++ b/loader2/loader.c
>@@ -645,6 +645,8 @@ static int parseCmdLineFlags(int flags, struct loaderData_s * loaderData,
>             loaderData->wepkey = strdup(argv[i] + 7);
>         else if (!strncasecmp(argv[i], "linksleep=", 10))
>             num_link_checks = atoi(argv[i] + 10);
>+        else if (!strncasecmp(argv[i], "dhcptimeout=", 12))
>+            loaderData->dhcpTimeout = atoi(argv[i] + 12);
>         else if (!strncasecmp(argv[i], "nicdelay=", 9))
>             post_link_sleep = atoi(argv[i] + 9);
>         else if (!strncasecmp(argv[i], "selinux=0", 9))
>@@ -1248,7 +1250,7 @@ int main(int argc, char ** argv) {
>         openlog("loader", 0, LOG_LOCAL0);
> 
>     memset(&loaderData, 0, sizeof(loaderData));
>-
>+    loaderData.dhcpTimeout = -1;
> 
>     extraArgs[0] = NULL;
>     flags = parseCmdLineFlags(flags, &loaderData, cmdLine);
>diff --git a/loader2/loader.h b/loader2/loader.h
>index 9de67f5..08af65d 100644
>--- a/loader2/loader.h
>+++ b/loader2/loader.h
>@@ -96,6 +96,7 @@ struct loaderData_s {
>     char * ip, *netmask, *gateway, *dns, *hostname, *peerid, *ethtool, *subchannels, *portname, *essid, *wepkey, *nettype, *ctcprot, *layer2, *macaddr;
>     int mtu;
>     int noDns;
>+    int dhcpTimeout;
>     int ipinfo_set;
>     char * ksFile;
>     char * method;
>diff --git a/loader2/net.c b/loader2/net.c
>index 80fe2b4..812da39 100644
>--- a/loader2/net.c
>+++ b/loader2/net.c
>@@ -455,6 +455,7 @@ void setupNetworkDeviceConfig(struct networkDeviceConfig * cfg,
>     }
> 
>     cfg->noDns = loaderData->noDns;
>+    cfg->dhcpTimeout = loaderData->dhcpTimeout;
> }
> 
> int readNetConfig(char * device, struct networkDeviceConfig * cfg, 
>@@ -700,7 +701,8 @@ char * doDhcp(char * ifname,
>     struct pumpOverrideInfo override;
>     memset(&override, 0, sizeof(struct pumpOverrideInfo));
>     override.numRetries = 10;
>-    override.timeout = 45;
>+    if(dev->dhcpTimeout<0) override.timeout=45;
>+    else override.timeout = dev->dhcpTimeout;
> 
>     setupWireless(dev);
>     logMessage("running dhcp for %s", ifname);
>diff --git a/loader2/net.h b/loader2/net.h
>index f71b8f4..7c4f59b 100644
>--- a/loader2/net.h
>+++ b/loader2/net.h
>@@ -15,6 +15,7 @@ struct networkDeviceConfig {
>     /* misc settings */
>     int isDynamic;
>     int noDns;
>+    int dhcpTimeout;
>     int preset;
> 
>     /* s390 settings */

Actions: View | Diff

Attachments on bug 189795: 158272 | 269681