[Pkg-sysvinit-commits] r1442 - in sysvinit-upstream/trunk: doc src

[Petter Reinholdtsen]

Author: pere
Date: 2009-07-12 13:23:04 +0000 (Sun, 12 Jul 2009)
New Revision: 1442

Modified:
   sysvinit-upstream/trunk/doc/Changelog
   sysvinit-upstream/trunk/src/init.c
Log:
Modify init to allow some time for failed opens to resolve themselves. Patch from Bill Nottingham and Fedora.

Modified: sysvinit-upstream/trunk/doc/Changelog
===================================================================
--- sysvinit-upstream/trunk/doc/Changelog	2009-07-12 13:21:42 UTC (rev 1441)
+++ sysvinit-upstream/trunk/doc/Changelog	2009-07-12 13:23:04 UTC (rev 1442)
@@ -57,6 +57,8 @@
   * Modify init and sulogin to fix emergency mode's tty, making sure ^C
     and ^Z work when booting with 'emergency' kernel option.  Patch from
     Samuel Thibault.
+  * Modify init to allow some time for failed opens to resolve themselves.
+    Patch from Bill Nottingham and Fedora.
 
  -- Petter Reinholdtsen <pere at debian.org>  Fri, 30 Jul 2004 14:14:58 +0200
 

Modified: sysvinit-upstream/trunk/src/init.c
===================================================================
--- sysvinit-upstream/trunk/src/init.c	2009-07-12 13:21:42 UTC (rev 1441)
+++ sysvinit-upstream/trunk/src/init.c	2009-07-12 13:23:04 UTC (rev 1442)
@@ -533,8 +533,10 @@
 	/*
 	 *	Retry the open five times.
 	 */
-	for(f = 0; f < 5; f++)
+	for(f = 0; f < 5; f++) {
 		if ((fd = open(console_dev, m)) >= 0) break;
+		usleep(100);
+	}
 
 	if (fd < 0) return fd;