Index: stable/9/usr.sbin/bsdinstall/scripts/keymap
===================================================================
--- stable/9/usr.sbin/bsdinstall/scripts/keymap	(revision 226209)
+++ stable/9/usr.sbin/bsdinstall/scripts/keymap	(revision 226210)
@@ -1,33 +1,35 @@
 #!/bin/sh
 #-
 # Copyright (c) 2011 Nathan Whitehorn
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
 # 1. Redistributions of source code must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
 #
 # THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
 # ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 # ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
 # FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 # DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
 # OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 # HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 # LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
 # $FreeBSD$
 
 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
Index: stable/9/usr.sbin/bsdinstall
===================================================================
--- stable/9/usr.sbin/bsdinstall	(revision 226209)
+++ stable/9/usr.sbin/bsdinstall	(revision 226210)

Property changes on: stable/9/usr.sbin/bsdinstall
___________________________________________________________________
Added: svn:mergeinfo
## -0,0 +0,4 ##
   Merged /head/usr.sbin/bsdinstall:r226058
   Merged /vendor/resolver/dist/usr.sbin/bsdinstall:r1540-186085
   Merged /projects/largeSMP/usr.sbin/bsdinstall:r221273-222812,222815-223757
   Merged /projects/quota64/usr.sbin/bsdinstall:r184125-207707