Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 12 Jun 2009 21:21:17 +0000 (UTC)
From:      Ed Schouten <ed@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r194079 - head/sys/kern
Message-ID:  <200906122121.n5CLLHJd093293@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: ed
Date: Fri Jun 12 21:21:17 2009
New Revision: 194079
URL: http://svn.freebsd.org/changeset/base/194079

Log:
  Revert my previous change, because it reintroduces an old regression.
  
  Because our rc scripts also open the /etc/ttyv* nodes, it revokes the
  console, preventing startup messages from being displayed.
  
  I really have to think about this. Maybe we should just give the console
  its own TTY and let it build on top of other TTYs. I'm still not sure
  what to do with input handling there.

Modified:
  head/sys/kern/tty.c

Modified: head/sys/kern/tty.c
==============================================================================
--- head/sys/kern/tty.c	Fri Jun 12 21:19:57 2009	(r194078)
+++ head/sys/kern/tty.c	Fri Jun 12 21:21:17 2009	(r194079)
@@ -322,14 +322,14 @@ ttydev_close(struct cdev *dev, int fflag
 	 * console.
 	 */
 	MPASS((tp->t_flags & TF_OPENED) != TF_OPENED);
-	if (dev == dev_console) {
+	if (dev == dev_console)
 		tp->t_flags &= ~TF_OPENED_CONS;
-		if (tp->t_flags & TF_OPENED) {
-			tty_unlock(tp);
-			return (0);
-		}
-	} else {
-		tp->t_flags &= ~TF_OPENED;
+	else
+		tp->t_flags &= ~(TF_OPENED_IN|TF_OPENED_OUT);
+
+	if (tp->t_flags & TF_OPENED) {
+		tty_unlock(tp);
+		return (0);
 	}
 
 	/*



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200906122121.n5CLLHJd093293>