hal/hald hald.c,1.38,1.39

[David Zeuthen]

Update of /cvs/hal/hal/hald
In directory gabe:/tmp/cvs-serv3002/hald

Modified Files:
	hald.c 
Log Message:
2005-08-22  David Zeuthen  <davidz at redhat.com>

        Patch from Cornelia Huck <cohuck at de.ibm.com> to change timeout from
        25 seconds to 250 seconds as a temporary workaround.

        * hald/hald.c (parent_wait_for_child): I'm running into some
        problems when trying to start the HAL daemon on large
        installations (like a S/390 LPAR with several thousands of
        devices). Device detection may take quite some time, more than the
        25 seconds specified as a timeout value for select() in
        hald/hald.c, and as a result, the daemon will abort.



Index: hald.c
===================================================================
RCS file: /cvs/hal/hal/hald/hald.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- hald.c	29 Jul 2005 20:32:57 -0000	1.38
+++ hald.c	23 Aug 2005 02:17:01 -0000	1.39
@@ -358,8 +358,8 @@
 	FD_SET(child_fd, &rfds);
 	FD_ZERO(&efds);
 	FD_SET(child_fd, &efds);
-	/* Wait up to 25 seconds for device probing */
-	tv.tv_sec = 25;
+	/* Wait up to 250 seconds for device probing */
+	tv.tv_sec = 250;
 	tv.tv_usec = 0;
 
 	retval = select (child_fd + 1, &rfds, NULL, &efds, &tv);