From owner-svn-src-all@FreeBSD.ORG  Sat Dec 21 16:43:41 2013
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:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id BE049DC0;
 Sat, 21 Dec 2013 16:43:41 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id A9DFC113C;
 Sat, 21 Dec 2013 16:43:41 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBLGhfxD015769;
 Sat, 21 Dec 2013 16:43:41 GMT (envelope-from dteske@svn.freebsd.org)
Received: (from dteske@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBLGhfEZ015767;
 Sat, 21 Dec 2013 16:43:41 GMT (envelope-from dteske@svn.freebsd.org)
Message-Id: <201312211643.rBLGhfEZ015767@svn.freebsd.org>
From: Devin Teske <dteske@FreeBSD.org>
Date: Sat, 21 Dec 2013 16:43:41 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r259686 - in head: release usr.sbin/bsdinstall/scripts
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.17
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/options/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: Sat, 21 Dec 2013 16:43:41 -0000

Author: dteske
Date: Sat Dec 21 16:43:40 2013
New Revision: 259686
URL: http://svnweb.freebsd.org/changeset/base/259686

Log:
  Move the installer's keymap solution introduced by SVN r259468. The new
  location of /etc/rc.local on the install media is more appropriate as it
  knows serial vs. non-serial and can also do the change earlier (so that
  even the initial Install dialog can benefit from the change).
  
  MFC after:	3 days

Modified:
  head/release/rc.local
  head/usr.sbin/bsdinstall/scripts/auto

Modified: head/release/rc.local
==============================================================================
--- head/release/rc.local	Sat Dec 21 16:23:31 2013	(r259685)
+++ head/release/rc.local	Sat Dec 21 16:43:40 2013	(r259686)
@@ -19,6 +19,10 @@ if [ $? -eq 0 ]; then
 		TERM=xterm
 	fi
 
+	# Don't send ESC on function-key 62/63 (left/right command key)
+	kbdcontrol -f 62 '' > /dev/null 2>&1
+	kbdcontrol -f 63 '' > /dev/null 2>&1
+
 	if [ -z "$EXTERNAL_VTY_STARTED" ]; then
 		# Init will clean these processes up if/when the system
 		# goes multiuser

Modified: head/usr.sbin/bsdinstall/scripts/auto
==============================================================================
--- head/usr.sbin/bsdinstall/scripts/auto	Sat Dec 21 16:23:31 2013	(r259685)
+++ head/usr.sbin/bsdinstall/scripts/auto	Sat Dec 21 16:43:40 2013	(r259686)
@@ -49,10 +49,6 @@ error() {
 
 ############################################################ MAIN
 
-# Don't send ESC on function-key 62/63 (left/right command key)
-f_quietly kbdcontrol -f 62 ''
-f_quietly kbdcontrol -f 63 ''
-
 f_dprintf "Began Installation at %s" "$( date )"
 
 rm -rf $BSDINSTALL_TMPETC