From owner-svn-src-all@FreeBSD.ORG  Thu Oct  6 14:22:38 2011
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 C221A1065674;
	Thu,  6 Oct 2011 14:22:38 +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 B1E028FC18;
	Thu,  6 Oct 2011 14:22:38 +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 p96EMcRJ064247;
	Thu, 6 Oct 2011 14:22:38 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p96EMc6L064245;
	Thu, 6 Oct 2011 14:22:38 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <201110061422.p96EMc6L064245@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Thu, 6 Oct 2011 14:22:38 +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: r226058 - head/usr.sbin/bsdinstall/scripts
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: Thu, 06 Oct 2011 14:22:38 -0000

Author: nwhitehorn
Date: Thu Oct  6 14:22:38 2011
New Revision: 226058
URL: http://svn.freebsd.org/changeset/base/226058

Log:
  Ask if you want to set the keymap before invoking kdbmap to prevent
  confusion.
  
  PR:		bin/160913
  MFC after:	3 days

Modified:
  head/usr.sbin/bsdinstall/scripts/keymap

Modified: head/usr.sbin/bsdinstall/scripts/keymap
==============================================================================
--- head/usr.sbin/bsdinstall/scripts/keymap	Thu Oct  6 11:48:13 2011	(r226057)
+++ head/usr.sbin/bsdinstall/scripts/keymap	Thu Oct  6 14:22:38 2011	(r226058)
@@ -28,6 +28,8 @@
 
 kbdcontrol -d >/dev/null 2>&1
 if [ $? -eq 0 ]; then
+	dialog --backtitle "FreeBSD Installer" --title "Keymap Selection" \
+	    --yesno "Would you like to set a non-default key mapping for your keyboard?" 0 0 || exit 0
 	exec 3>&1
 	kbdmap 2>&1 1>&3 | grep 'keymap=' > $BSDINSTALL_TMPETC/rc.conf.keymap
 fi