From owner-svn-src-stable@FreeBSD.ORG  Mon Oct 10 13:57:35 2011
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D410B106566C;
	Mon, 10 Oct 2011 13:57:35 +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 C300C8FC12;
	Mon, 10 Oct 2011 13:57:35 +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 p9ADvZaQ063528;
	Mon, 10 Oct 2011 13:57:35 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p9ADvZLb063526;
	Mon, 10 Oct 2011 13:57:35 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <201110101357.p9ADvZLb063526@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Mon, 10 Oct 2011 13:57:35 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r226210 - stable/9/usr.sbin/bsdinstall/scripts
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 10 Oct 2011 13:57:35 -0000

Author: nwhitehorn
Date: Mon Oct 10 13:57:35 2011
New Revision: 226210
URL: http://svn.freebsd.org/changeset/base/226210

Log:
  MFC r226058:
  Ask if you want to set the keymap before invoking kdbmap to prevent
  confusion.
  
  PR:		bin/160913
  Approved by:	re (kib)

Modified:
  stable/9/usr.sbin/bsdinstall/scripts/keymap
Directory Properties:
  stable/9/usr.sbin/bsdinstall/   (props changed)

Modified: stable/9/usr.sbin/bsdinstall/scripts/keymap
==============================================================================
--- stable/9/usr.sbin/bsdinstall/scripts/keymap	Mon Oct 10 13:51:21 2011	(r226209)
+++ stable/9/usr.sbin/bsdinstall/scripts/keymap	Mon Oct 10 13:57:35 2011	(r226210)
@@ -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