Attachment 158272 Details for Bug 189795 – Dumb hardcoded fix to pump timeout and retries

[patch] Dumb hardcoded fix to pump timeout and retries

anaconda-10.1.1.46-pump-wait-retry.patch (text/plain), 1.31 KB, created by Doug Scoular on 2007-06-29 21:48:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Doug Scoular

Created: 2007-06-29 21:48:09 UTC

Size: 1.31 KB

patch

obsolete

>diff -uNr anaconda-10.1.1.46/loader2/net.c anaconda-10.1.1.46-dug/loader2/net.c
>--- anaconda-10.1.1.46/loader2/net.c    2006-04-20 06:30:56.000000000 +1000
>+++ anaconda-10.1.1.46-dug/loader2/net.c        2007-06-29 13:05:50.000000000 +1000
>@@ -689,11 +689,29 @@
>
> char * doDhcp(char * ifname,
>               struct networkDeviceConfig *dev, char * dhcpclass) {
>+    extern int num_link_checks;
>+    extern int post_link_sleep;
>+    struct pumpOverrideInfo override;
>+
>+    /*
>+     * Originally thought I could use num_link_checks and
>+     * post_link_sleep but this confuses the two sets of wait code.
>+     *
>+     * Unsure if we should have customisable waits for link in
>+     * anaconda at all when we want to DHCP. Let pump handle
>+     * custom waits and retries methinks - dscoular@cisco.com
>+     * Hard coding for now.
>+     */
>+    memset(&override, 0, sizeof(override));
>+    pumpInitOverride ( &override );
>+    override.timeout = 100; /* post_link_sleep; out for now */
>+    override.numRetries = 40; /* num_link_checks; out for now */
>+
>     setupWireless(dev);
>     logMessage("running dhcp for %s", ifname);
>     return pumpDhcpClassRun(ifname, 0, 0, NULL,
>                             dhcpclass ? dhcpclass : "anaconda",
>-                            &dev->dev, NULL);
>+                            &dev->dev, &override);
>
> }
>
>

Actions: View | Diff

Attachments on bug 189795: 158272 | 269681