summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKenneth R Westerback <krw@cvs.openbsd.org>2009-06-09 03:33:50 +0000
committerKenneth R Westerback <krw@cvs.openbsd.org>2009-06-09 03:33:50 +0000
commit1d0ef45f7b4f5d5c65496c9545d3b98828d4a1eb (patch)
tree8aa41a5e4c378c5e8e36c54538c7edd700628b2a
parent9ffe1b9cc7ba80664a74a387551f385f8a718448 (diff)
Tighten and tweak keyboard question. Use 'layout' instead of 'type'
as suggested by mk@. Shortened verbiage allows us to bring back 'L' as a way to list the alternate layouts, as pointed out by Andr?s on tech@. On some keyboards finding the '?' can be a challenge before the layout is set. ok deraadt@
-rw-r--r--distrib/miniroot/install.sub10
1 files changed, 5 insertions, 5 deletions
diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub
index 1d5b4c283aa..44f10d1ff7f 100644
--- a/distrib/miniroot/install.sub
+++ b/distrib/miniroot/install.sub
@@ -1,4 +1,4 @@
-# $OpenBSD: install.sub,v 1.575 2009/06/07 03:52:29 krw Exp $
+# $OpenBSD: install.sub,v 1.576 2009/06/09 03:33:49 krw Exp $
# $NetBSD: install.sub,v 1.5.2.8 1996/09/02 23:25:02 pk Exp $
#
# Copyright (c) 1997-2009 Todd Miller, Theo de Raadt, Ken Westerback
@@ -72,7 +72,7 @@
. install.md
set_term() {
- local _tables
+ local _layouts
export TERM=${TERM:-${MDTERM:-vt220}}
if [[ -n $CONSOLE ]]; then
@@ -81,12 +81,12 @@ set_term() {
export TERM=$resp
else
[[ -x /sbin/kbd ]] || return
- _tables=$(bsort $(kbd -l | egrep -v "^(user|tables|encoding)"))
+ _layouts=$(bsort $(kbd -l | egrep -v "^(user|tables|encoding)"))
echo
while :; do
- ask "Choose your keyboard type if it is nationalized? ('?' for list)" "default"
+ ask "Choose your keyboard layout ('?' or 'L' for list)" "default"
case $resp in
- "?") echo "Major tables: $_tables" ;;
+ "?"|L|l) echo "Available layouts: $_layouts" ;;
default) return ;;
*) kbd $resp && { echo $resp >/tmp/kbdtype ; return ; } ;;
esac