[Pkg-sysvinit-commits] r689 - in sysvinit/trunk/debian: . patches
Thomas Hood
jdthood-guest at costa.debian.org
Mon Jan 23 11:27:42 UTC 2006
Author: jdthood-guest
Date: 2006-01-23 11:27:41 +0000 (Mon, 23 Jan 2006)
New Revision: 689
Added:
sysvinit/trunk/debian/patches/53_bootlogd_ttyB.dpatch
Modified:
sysvinit/trunk/debian/changelog
sysvinit/trunk/debian/patches/00list
Log:
Also try ttyB0
Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog 2006-01-23 11:19:46 UTC (rev 688)
+++ sysvinit/trunk/debian/changelog 2006-01-23 11:27:41 UTC (rev 689)
@@ -1,4 +1,4 @@
-sysvinit (2.86.ds1-12~1) unstable; urgency=low
+sysvinit (2.86.ds1-12~2) unstable; urgency=low
[ Thomas Hood ]
* bootlogd: 51_bootlogd_syncalot: Don't sync after each line unless
@@ -7,6 +7,8 @@
* bootlogd: 52_bootlogd_createlogfile.dpatch: Don't write to logfile
if it doesn't exist unless the (new) -c option is given
(Closes: #341167)
+ * bootlogd: 53_bootlogd_ttyB.dpatch: Also try ttyB0
+ (Closes: #348506)
* initscripts postinst: Actually remove some things on purge
-- Thomas Hood <jdthood at yahoo.co.uk> Mon, 23 Jan 2006 11:24:47 +0100
Modified: sysvinit/trunk/debian/patches/00list
===================================================================
--- sysvinit/trunk/debian/patches/00list 2006-01-23 11:19:46 UTC (rev 688)
+++ sysvinit/trunk/debian/patches/00list 2006-01-23 11:27:41 UTC (rev 689)
@@ -14,6 +14,7 @@
50_bootlogd_exitcode
51_bootlogd_syncalot
52_bootlogd_createlogfile
+53_bootlogd_ttyB
60_init_race
61_init_msg
62_init_freebsdterm
Added: sysvinit/trunk/debian/patches/53_bootlogd_ttyB.dpatch
===================================================================
--- sysvinit/trunk/debian/patches/53_bootlogd_ttyB.dpatch 2006-01-23 11:19:46 UTC (rev 688)
+++ sysvinit/trunk/debian/patches/53_bootlogd_ttyB.dpatch 2006-01-23 11:27:41 UTC (rev 689)
@@ -0,0 +1,36 @@
+#! /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;
Property changes on: sysvinit/trunk/debian/patches/53_bootlogd_ttyB.dpatch
___________________________________________________________________
Name: svn:executable
+ *
More information about the Pkg-sysvinit-commits
mailing list