From owner-svn-src-all@FreeBSD.ORG  Fri Jun 12 21:21:17 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id EA556106566B;
	Fri, 12 Jun 2009 21:21:17 +0000 (UTC) (envelope-from ed@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id D91418FC08;
	Fri, 12 Jun 2009 21:21:17 +0000 (UTC) (envelope-from ed@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n5CLLHYw093294;
	Fri, 12 Jun 2009 21:21:17 GMT (envelope-from ed@svn.freebsd.org)
Received: (from ed@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5CLLHJd093293;
	Fri, 12 Jun 2009 21:21:17 GMT (envelope-from ed@svn.freebsd.org)
Message-Id: <200906122121.n5CLLHJd093293@svn.freebsd.org>
From: Ed Schouten <ed@FreeBSD.org>
Date: Fri, 12 Jun 2009 21:21:17 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r194079 - head/sys/kern
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 12 Jun 2009 21:21:18 -0000

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);
 	}
 
 	/*