[Pkg-sysvinit-commits] r1384 - in sysvinit/trunk/debian: . patches

[Petter Reinholdtsen]

Author: pere
Date: 2009-07-08 15:03:39 +0000 (Wed, 08 Jul 2009)
New Revision: 1384

Added:
   sysvinit/trunk/debian/patches/70_init_consoleopen.dpatch
Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/patches/00list
Log:
New patch 70_init_consoleopen to give missing console some time to
show up. Patch from Bill Nottingham and Fedora.


Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2009-07-08 14:55:49 UTC (rev 1383)
+++ sysvinit/trunk/debian/changelog	2009-07-08 15:03:39 UTC (rev 1384)
@@ -37,8 +37,11 @@
   * New patch 17_doc_halt changing halt(8) to make it clear that sync
     might happen even when -n is used.  Patch from Bill Nottingham and
     Fedora.
-  * Add -c option to pidof, for only checking processes with the same
-    file system root.  Patch by Thomas Woerner and Fedora.
+  * New patch 47_pidof_chroot adding -c option to pidof, for only
+    checking processes with the same file system root.  Patch by
+    Thomas Woerner and Fedora.
+  * New patch 70_init_consoleopen to give missing console some time to
+    show up. Patch from Bill Nottingham and Fedora.
 
  -- Petter Reinholdtsen <pere at debian.org>  Wed, 01 Jul 2009 20:04:20 +0200
 

Modified: sysvinit/trunk/debian/patches/00list
===================================================================
--- sysvinit/trunk/debian/patches/00list	2009-07-08 14:55:49 UTC (rev 1383)
+++ sysvinit/trunk/debian/patches/00list	2009-07-08 15:03:39 UTC (rev 1384)
@@ -34,6 +34,7 @@
 67_init_hddown
 #68_init_quiet
 69_init_waiting
+70_init_consoleopen
 70_wall_ttyname
 71_wall_hostname
 80_killall_pidof

Added: sysvinit/trunk/debian/patches/70_init_consoleopen.dpatch
===================================================================
--- sysvinit/trunk/debian/patches/70_init_consoleopen.dpatch	                        (rev 0)
+++ sysvinit/trunk/debian/patches/70_init_consoleopen.dpatch	2009-07-08 15:03:39 UTC (rev 1384)
@@ -0,0 +1,20 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 70_init_consoleopen.dpatch by Bill Nottingham and Fedora.
+
+Allow some time for failed opens to resolve themselves (RH bug #181546).
+
+ at DPATCH@
+--- sysvinit-2.86/src/init.c.eieio	2006-08-10 15:34:23.000000000 -0400
++++ sysvinit-2.86/src/init.c	2006-08-10 15:34:50.000000000 -0400
+@@ -531,8 +531,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;
+ 


Property changes on: sysvinit/trunk/debian/patches/70_init_consoleopen.dpatch
___________________________________________________________________
Added: svn:executable
   + *