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

[Petter Reinholdtsen]

Author: pere
Date: 2009-07-24 13:24:14 +0000 (Fri, 24 Jul 2009)
New Revision: 1508

Removed:
   sysvinit/trunk/debian/patches/50_bootlogd_exitcode.dpatch
Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/patches/00list
Log:
Drop patch 50_bootlogd_exitcode now included upstream.

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2009-07-24 13:21:36 UTC (rev 1507)
+++ sysvinit/trunk/debian/changelog	2009-07-24 13:24:14 UTC (rev 1508)
@@ -19,6 +19,7 @@
     - Drop patch 42_utmpdump_retval now included upstream.
     - Drop patch 45_pidof_symlink now included upstream.
     - Drop patch 47_pidof_chroot now included upstream.
+    - Drop patch 50_bootlogd_exitcode now included upstream.
     - Drop patch 60_init_race now included upstream.
 
   * XXX Need to remove debian patches now included in the new upstream release.

Modified: sysvinit/trunk/debian/patches/00list
===================================================================
--- sysvinit/trunk/debian/patches/00list	2009-07-24 13:21:36 UTC (rev 1507)
+++ sysvinit/trunk/debian/patches/00list	2009-07-24 13:24:14 UTC (rev 1508)
@@ -6,7 +6,6 @@
 14_doc_fsf_addr
 21_ifdown_kfreebsd
 46_pidof_symlinkman
-##50_bootlogd_exitcode
 ##51_bootlogd_syncalot
 ##52_bootlogd_createlogfile
 ##53_bootlogd_ttyB

Deleted: sysvinit/trunk/debian/patches/50_bootlogd_exitcode.dpatch
===================================================================
--- sysvinit/trunk/debian/patches/50_bootlogd_exitcode.dpatch	2009-07-24 13:21:36 UTC (rev 1507)
+++ sysvinit/trunk/debian/patches/50_bootlogd_exitcode.dpatch	2009-07-24 13:24:14 UTC (rev 1508)
@@ -1,33 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 50_bootlogd_exitcode.dpatch by Petter Reinholdtsen
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Make sure bootlogd return non-error exit code when forking off the
-## DP: child.  Fixes bug #326640.
-
- at DPATCH@
-Index: sysvinit/src/bootlogd.c
-===================================================================
---- sysvinit/src/bootlogd.c	(revisjon 56)
-+++ sysvinit/src/bootlogd.c	(arbeidskopi)
-@@ -523,8 +523,19 @@
- 	 *	Fork and write pidfile if needed.
- 	 */
- 	if (!dontfork) {
--		if (fork())
-+		pid_t child_pid = fork();
-+		switch (child_pid) {
-+		case -1: /* I am parent and the attempt to create a child failed */
-+			fprintf(stderr, "bootlogd: fork failed: %s\n",
-+				strerror(errno));
- 			exit(1);
-+			break;
-+		case 0: /* I am the child */
-+			break;
-+		default: /* I am parent and got child's pid */
-+			exit(0);
-+			break;
-+		}
- 		setsid();
- 	}
- 	if (pidfile) {