From owner-svn-src-head@FreeBSD.ORG  Fri Jan  2 23:32:44 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 12A2F106564A;
	Fri,  2 Jan 2009 23:32:44 +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 0004A8FC0C;
	Fri,  2 Jan 2009 23:32:43 +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 n02NWhU8010413;
	Fri, 2 Jan 2009 23:32:43 GMT (envelope-from ed@svn.freebsd.org)
Received: (from ed@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n02NWhbX010412;
	Fri, 2 Jan 2009 23:32:43 GMT (envelope-from ed@svn.freebsd.org)
Message-Id: <200901022332.n02NWhbX010412@svn.freebsd.org>
From: Ed Schouten <ed@FreeBSD.org>
Date: Fri, 2 Jan 2009 23:32:43 +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: r186706 - head/sys/kern
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 02 Jan 2009 23:32:44 -0000

Author: ed
Date: Fri Jan  2 23:32:43 2009
New Revision: 186706
URL: http://svn.freebsd.org/changeset/base/186706

Log:
  Don't let /dev/console be revoked if the TTY below is being closed.
  
  During startup some of the syscons TTY's are used to set attributes like
  the screensaver and mouse options. These actions cause /dev/console to
  be rendered unusable.
  
  Fix the issue by leaving the TTY opened when it is used as the console
  device.
  
  Reported by:	imp

Modified:
  head/sys/kern/tty.c

Modified: head/sys/kern/tty.c
==============================================================================
--- head/sys/kern/tty.c	Fri Jan  2 22:51:30 2009	(r186705)
+++ head/sys/kern/tty.c	Fri Jan  2 23:32:43 2009	(r186706)
@@ -308,6 +308,13 @@ ttydev_close(struct cdev *dev, int fflag
 {
 	struct tty *tp = dev->si_drv1;
 
+	/*
+	 * Don't actually close the device if it is being used as the
+	 * console.
+	 */
+	if (strcmp(dev_console_filename, tty_devname(tp)) == 0)
+		return (0);
+
 	tty_lock(tp);
 
 	/*