rpms/dhcp/devel dhcp-3.0.3-fast_dhclient.patch,NONE,1.1

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Sat Jul 30 00:47:16 UTC 2005


Author: jvdias

Update of /cvs/dist/rpms/dhcp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24175

Added Files:
	dhcp-3.0.3-fast_dhclient.patch 
Log Message:
remove 1-5 second wait on startup altogether

dhcp-3.0.3-fast_dhclient.patch:
 dhclient.c |   17 ++---------------
 1 files changed, 2 insertions(+), 15 deletions(-)

--- NEW FILE dhcp-3.0.3-fast_dhclient.patch ---
--- dhcp-3.0.3/client/dhclient.c.fast_dhclient	2005-07-29 18:17:32.000000000 -0400
+++ dhcp-3.0.3/client/dhclient.c	2005-07-29 20:30:43.000000000 -0400
@@ -104,7 +104,6 @@
 	int no_dhclient_db = 0;
 	int no_dhclient_pid = 0;
 	int no_dhclient_script = 0;
-	int n_ips=0;
 	char *s;
 
 	/* Make sure we have stdin, stdout and stderr. */
@@ -505,8 +504,7 @@
 	   Not much entropy, but we're booting, so we're not likely to
 	   find anything better. */
 	seed = 0;
-	n_ips=0;
-	for (ip = interfaces; ip; ip = ip -> next, ++n_ips) {
+	for (ip = interfaces; ip; ip = ip -> next) {
 		int junk;
 		memcpy (&junk,
 			&ip -> hw_address.hbuf [ip -> hw_address.hlen -
@@ -523,18 +521,7 @@
 				do_release (client);
 			else {
 				client -> state = S_INIT;
-				if( n_ips > 1 )
-				{
-					/* Set up a timeout to start the initialization
-					   process. */
-					add_timeout (cur_time + random () % 5,
-						     state_reboot, client, 0, 0);
-				}else
-				{
-					/* Kick off with no delay if only one interface */
-					add_timeout (cur_time, 
-						     state_reboot, client, 0, 0);
-				}
+				add_timeout (cur_time, state_reboot, client, 0, 0);
 			}
 		}
 	}




More information about the fedora-cvs-commits mailing list