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

[Petter Reinholdtsen]

Author: pere
Date: 2009-09-30 09:18:35 +0000 (Wed, 30 Sep 2009)
New Revision: 1790

Added:
   sysvinit/trunk/debian/patches/55_bootlogd_flush.patch
Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/patches/series
Log:
Add patch 55_bootlogd_flush.patch to make sure lines are flushed
to the kernel even when not asking the kernel to flush to disk
(Closes: 542515).  Patch from Scott Gifford.

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2009-09-30 09:01:39 UTC (rev 1789)
+++ sysvinit/trunk/debian/changelog	2009-09-30 09:18:35 UTC (rev 1790)
@@ -20,6 +20,9 @@
   * Update 91_sulogin_lockedpw.dpatch to include documentation,
     without the Ubuntu references.  Based on patch from Scott James
     Remnant and Ubuntu.
+  * Add patch 55_bootlogd_flush.patch to make sure lines are flushed
+    to the kernel even when not asking the kernel to flush to disk
+    (Closes: 542515).  Patch from Scott Gifford.
 
   [ Henrique de Moraes Holschuh ]
   * invoke-rc.d: return exit status 4 when action "status" is denied,

Added: sysvinit/trunk/debian/patches/55_bootlogd_flush.patch
===================================================================
--- sysvinit/trunk/debian/patches/55_bootlogd_flush.patch	                        (rev 0)
+++ sysvinit/trunk/debian/patches/55_bootlogd_flush.patch	2009-09-30 09:18:35 UTC (rev 1790)
@@ -0,0 +1,28 @@
+Purpose: Make sure bootlogd fflush() every line, even if asked not to
+	 flush to disk using fdatasync().
+Authour: Scott Gifford
+Fixes:   #542515
+Status:  not set upstream yet
+
+--- a/src/bootlogd.c.orig	2009-08-19 20:26:35.000000000 -0400
++++ a/src/bootlogd.c	2009-08-19 20:26:56.000000000 -0400
+@@ -338,7 +338,7 @@
+ 				break;
+ 			case '\n':
+ 				didnl = 1;
+-				dosync = syncalot;
++				dosync = 1;
+ 				break;
+ 			case '\t':
+ 				line.pos += (line.pos / 8 + 1) * 8;
+@@ -370,7 +370,9 @@
+ 
+ 	if (dosync) {
+ 		fflush(fp);
+-		fdatasync(fileno(fp));
++		if (syncalot) {
++			fdatasync(fileno(fp));
++		}
+ 	}
+ 
+ 	outptr += olen;

Modified: sysvinit/trunk/debian/patches/series
===================================================================
--- sysvinit/trunk/debian/patches/series	2009-09-30 09:01:39 UTC (rev 1789)
+++ sysvinit/trunk/debian/patches/series	2009-09-30 09:18:35 UTC (rev 1790)
@@ -5,6 +5,7 @@
 46_pidof_symlinkman.dpatch
 50_bootlogd_devsubdir.dpatch
 54_bootlogd_findptyfail.dpatch
+55_bootlogd_flush.patch
 60_init_selinux_ifdef.dpatch
 62_init_freebsdterm.dpatch
 70_compiler_warnings.dpatch