From owner-svn-src-user@FreeBSD.ORG  Thu Jan 13 17:04:02 2011
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D3F31106567A;
	Thu, 13 Jan 2011 17:04:02 +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 C320C8FC1E;
	Thu, 13 Jan 2011 17:04:02 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p0DH42fe057452;
	Thu, 13 Jan 2011 17:04:02 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p0DH42Z1057448;
	Thu, 13 Jan 2011 17:04:02 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <201101131704.p0DH42Z1057448@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Thu, 13 Jan 2011 17:04:02 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r217362 - user/nwhitehorn/bsdinstall/scripts
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 13 Jan 2011 17:04:02 -0000

Author: nwhitehorn
Date: Thu Jan 13 17:04:02 2011
New Revision: 217362
URL: http://svn.freebsd.org/changeset/base/217362

Log:
  Allow user to set their keymap at the beginning of the installation. Does
  not run on serial console or X installations.

Added:
  user/nwhitehorn/bsdinstall/scripts/keymap   (contents, props changed)
Modified:
  user/nwhitehorn/bsdinstall/scripts/Makefile
  user/nwhitehorn/bsdinstall/scripts/auto

Modified: user/nwhitehorn/bsdinstall/scripts/Makefile
==============================================================================
--- user/nwhitehorn/bsdinstall/scripts/Makefile	Thu Jan 13 17:02:39 2011	(r217361)
+++ user/nwhitehorn/bsdinstall/scripts/Makefile	Thu Jan 13 17:04:02 2011	(r217362)
@@ -1,7 +1,7 @@
 # $FreeBSD $
 
-SCRIPTS= auto adduser config hostname mount netconfig rootpass services time \
-	 umount
+SCRIPTS= auto adduser config hostname keymap mount netconfig rootpass services \
+	 time umount
 BINDIR= /usr/libexec/bsdinstall
 
 NO_MAN=	true

Modified: user/nwhitehorn/bsdinstall/scripts/auto
==============================================================================
--- user/nwhitehorn/bsdinstall/scripts/auto	Thu Jan 13 17:02:39 2011	(r217361)
+++ user/nwhitehorn/bsdinstall/scripts/auto	Thu Jan 13 17:04:02 2011	(r217362)
@@ -14,10 +14,14 @@ error() {
 	fi
 }
 
-trap error SIGINT	# Catch cntrl-C here
 
 rm -rf $BSDINSTALL_TMPETC
 mkdir $BSDINSTALL_TMPETC
+
+trap true SIGINT	# This section is optional
+bsdinstall keymap
+
+trap error SIGINT	# Catch cntrl-C here
 bsdinstall hostname || error
 
 FETCH_DISTRIBUTIONS=""

Added: user/nwhitehorn/bsdinstall/scripts/keymap
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ user/nwhitehorn/bsdinstall/scripts/keymap	Thu Jan 13 17:04:02 2011	(r217362)
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+kbdcontrol -d >/dev/null 2>&1
+if [ $? -eq 0 ]; then
+	kbdmap 3>&2 2>&1 1>&3 | grep 'keymap=' >> $BSDINSTALL_TMPETC/rc.conf
+fi