2006-06-21 Jeremy Katz <katzj@redhat.com>

	* loader2/net.c (doDhcp): Use a timeout of 45 seconds instead of
	10 so that we're in compliance with the dhcp rfc

2 files changed, 11 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index 74dcb2a43..163e89641 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-06-21  Jeremy Katz  <katzj@redhat.com>
+
+	* loader2/net.c (doDhcp): Use a timeout of 45 seconds instead of
+	10 so that we're in compliance with the dhcp rfc
+
 2006-06-21  Peter Jones  <pjones@redhat.com>
 
 	* net.c (ipCallback): check return values correctly on inet_pton()
diff --git a/loader2/net.c b/loader2/net.c
index 885d2dee5..c0488898b 100644
--- a/loader2/net.c
+++ b/loader2/net.c
@@ -411,7 +411,7 @@ void setupNetworkDeviceConfig(struct networkDeviceConfig * cfg,
                 logMessage(DEBUGLVL, "dhcp: %s", ret);
                 return;
             }
-            
+
             cfg->isDynamic = 1;
             cfg->preset = 1;
         } else if (inet_pton(AF_INET, loaderData->ip, &addr) >= 1) {
@@ -462,13 +462,13 @@ void setupNetworkDeviceConfig(struct networkDeviceConfig * cfg,
                 cfg->dev.dnsServers[cfg->dev.numDns] = ip_addr_in(&addr);
                 cfg->dev.numDns++;
                 inet_ntop(AF_INET, &addr, ret, INET_ADDRSTRLEN);
-                logMessage(DEBUGLVL, "adding %s", ret);
+                logMessage(DEBUGLVL, "adding dns4 %s", ret);
                 c = strtok(NULL, ",");
             } else if (inet_pton(AF_INET6, c, &addr6) >= 1) {
                 cfg->dev.dnsServers[cfg->dev.numDns] = ip_addr_in6(&addr6);
                 cfg->dev.numDns++;
                 inet_ntop(AF_INET6, &addr6, ret, INET6_ADDRSTRLEN);
-                logMessage(DEBUGLVL, "adding %s", ret);
+                logMessage(DEBUGLVL, "adding dns6 %s", ret);
                 c = strtok(NULL, ",");
             }
         }
@@ -829,13 +829,14 @@ void netlogger(void *arg, int priority, char *fmt, va_list va) {
 char *doDhcp(struct networkDeviceConfig *dev) {
     struct pumpNetIntf *i;
     char *r = NULL;
+    time_t timeout = 45;
 
     i = &dev->dev;
 
     if (FL_NOIPV6(flags))
-        r = pumpDhcpClassRun(i,0L,0L,DHCPv6_DISABLE,0,10,netlogger,LOG_INFO);
+        r = pumpDhcpClassRun(i,0L,"anaconda",DHCPv6_DISABLE,0,timeout,netlogger,LOG_INFO);
     else
-        r = pumpDhcpClassRun(i,0L,0L,0,0,10,netlogger,LOG_INFO);
+        r = pumpDhcpClassRun(i,0L,"anaconda",0,0,timeout,netlogger,LOG_INFO);
 
     return r;
 }