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

[Petter Reinholdtsen]

Author: pere
Date: 2009-07-24 13:29:08 +0000 (Fri, 24 Jul 2009)
New Revision: 1510

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

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2009-07-24 13:26:36 UTC (rev 1509)
+++ sysvinit/trunk/debian/changelog	2009-07-24 13:29:08 UTC (rev 1510)
@@ -21,6 +21,7 @@
     - Drop patch 47_pidof_chroot now included upstream.
     - Drop patch 50_bootlogd_exitcode now included upstream.
     - Drop patch 51_bootlogd_syncalot now included upstream.
+    - Drop patch 53_bootlogd_ttyB 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:26:36 UTC (rev 1509)
+++ sysvinit/trunk/debian/patches/00list	2009-07-24 13:29:08 UTC (rev 1510)
@@ -7,7 +7,6 @@
 21_ifdown_kfreebsd
 46_pidof_symlinkman
 ##52_bootlogd_createlogfile
-##53_bootlogd_ttyB
 ##54_bootlogd_findptyfail
 ##61_init_msg
 ##62_init_freebsdterm

Deleted: sysvinit/trunk/debian/patches/53_bootlogd_ttyB.dpatch
===================================================================
--- sysvinit/trunk/debian/patches/53_bootlogd_ttyB.dpatch	2009-07-24 13:26:36 UTC (rev 1509)
+++ sysvinit/trunk/debian/patches/53_bootlogd_ttyB.dpatch	2009-07-24 13:29:08 UTC (rev 1510)
@@ -1,36 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 53_bootlogd_ttyB.dpatch by  <jdthood at yahoo.co.uk>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad --exclude=CVS --exclude=.svn ./src/bootlogd.c /tmp/dpep-work.tNbXVe/trunk/src/bootlogd.c
---- ./src/bootlogd.c	2006-01-23 12:22:09.000000000 +0100
-+++ /tmp/dpep-work.tNbXVe/trunk/src/bootlogd.c	2006-01-23 12:26:26.000000000 +0100
-@@ -73,6 +73,7 @@
- 	char	*dev1;
- 	char	*dev2;
- } consdev[] = {
-+	{ "ttyB",	"/dev/ttyB%s",		NULL		},
- 	{ "ttySC",	"/dev/ttySC%s",		"/dev/ttsc/%s"	},
- 	{ "ttyS",	"/dev/ttyS%s",		"/dev/tts/%s"	},
- 	{ "tty",	"/dev/tty%s",		"/dev/vc/%s"	},
-@@ -84,7 +85,7 @@
-  *	Devices to try as console if not found on kernel command line.
-  *	Tried from left to right (as opposed to kernel cmdline).
-  */
--char *defcons[] = { "tty0", "hvc0", "ttyS0", "ttySC0", NULL };
-+char *defcons[] = { "tty0", "hvc0", "ttyS0", "ttySC0", "ttyB0", NULL };
- 
- /*
-  *	Catch signals.
-@@ -271,8 +272,6 @@
- 	/*
- 	 *	OK, so find console= in /proc/cmdline.
- 	 *	Parse in reverse, opening as we go.
--	 *
--	 *	Valid console devices: ttySC, ttyS, tty, hvc.
- 	 */
- 	p = buf + n;
- 	*p-- = 0;