From owner-svn-src-head@FreeBSD.ORG  Mon Jan 23 16:17:55 2012
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 4FC91106564A;
	Mon, 23 Jan 2012 16:17:55 +0000 (UTC)
	(envelope-from nwhitehorn@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 3EA978FC0C;
	Mon, 23 Jan 2012 16:17:55 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q0NGHtXh033981;
	Mon, 23 Jan 2012 16:17:55 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q0NGHtPq033979;
	Mon, 23 Jan 2012 16:17:55 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <201201231617.q0NGHtPq033979@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Mon, 23 Jan 2012 16:17:55 +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: r230484 - head/release
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: Mon, 23 Jan 2012 16:17:55 -0000

Author: nwhitehorn
Date: Mon Jan 23 16:17:54 2012
New Revision: 230484
URL: http://svn.freebsd.org/changeset/base/230484

Log:
  Part of r230482 didn't actually work. Revert it for now. This means PR
  161047 isn't actually fixed.
  
  PR:		bin/161047

Modified:
  head/release/rc.local

Modified: head/release/rc.local
==============================================================================
--- head/release/rc.local	Mon Jan 23 15:50:16 2012	(r230483)
+++ head/release/rc.local	Mon Jan 23 16:17:54 2012	(r230484)
@@ -14,14 +14,12 @@ if [ $? -eq 0 ]; then
 	TERM=xterm
 
 	if [ -z "$EXTERNAL_VTY_STARTED" ]; then
-		vidcontrol -s 2 # Switch to a VTY with no kernel messages
 		# Init will clean these processes up if/when the system
 		# goes multiuser
 		touch /tmp/bsdinstall_log
 		tail -f /tmp/bsdinstall_log > /dev/ttyv2 &
 		/usr/libexec/getty autologin ttyv3
 		EXTERNAL_VTY_STARTED=1
-		trap "vidcontrol -s 1" EXIT
 	fi
 else
 	# Serial or other console