[Pkg-sysvinit-commits] r1433 - in sysvinit-upstream/trunk: doc src

[Petter Reinholdtsen]

Author: pere
Date: 2009-07-11 06:51:14 +0000 (Sat, 11 Jul 2009)
New Revision: 1433

Modified:
   sysvinit-upstream/trunk/doc/Changelog
   sysvinit-upstream/trunk/src/bootlogd.c
Log:
Let bootlogd also look at ttyB* devices to work on HPPA.  Patch
from Thomas Hood.


Modified: sysvinit-upstream/trunk/doc/Changelog
===================================================================
--- sysvinit-upstream/trunk/doc/Changelog	2009-07-11 06:45:23 UTC (rev 1432)
+++ sysvinit-upstream/trunk/doc/Changelog	2009-07-11 06:51:14 UTC (rev 1433)
@@ -47,6 +47,8 @@
     fdatasync().  Patch from Thomas Hood.
   * Add bootlogd option -c to tell it to create the log file if it does
     not exist.  Patch from Thomas Hood.
+  * Let bootlogd also look at ttyB* devices to work on HPPA.  Patch
+    from Thomas Hood.
 
  -- Petter Reinholdtsen <pere at debian.org>  Fri, 30 Jul 2004 14:14:58 +0200
 

Modified: sysvinit-upstream/trunk/src/bootlogd.c
===================================================================
--- sysvinit-upstream/trunk/src/bootlogd.c	2009-07-11 06:45:23 UTC (rev 1432)
+++ sysvinit-upstream/trunk/src/bootlogd.c	2009-07-11 06:51:14 UTC (rev 1433)
@@ -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;