diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2005-04-13 02:03:39 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2005-04-13 02:03:39 +0000 |
| commit | 0d4c8a4c3b4618c4099714955e0c33d8b65e781d (patch) | |
| tree | 178f828e219e52da288ab8bdb04b1e873085a35f /distrib | |
| parent | 81044b50bc62a9cb29aaa225c720eb21f00c6fd7 (diff) | |
Allow any valid kbd(8) mapping to be specified (e.g. us.dvorak). Be
more terse both in prompts and output. Show list of major tables only
on request. Problem noted by Matt Jibson.
ok deraadt@
Diffstat (limited to 'distrib')
| -rw-r--r-- | distrib/miniroot/install.sub | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub index d920a708fab..b2474a4f531 100644 --- a/distrib/miniroot/install.sub +++ b/distrib/miniroot/install.sub @@ -1,4 +1,4 @@ -# $OpenBSD: install.sub,v 1.376 2005/04/09 23:47:34 deraadt Exp $ +# $OpenBSD: install.sub,v 1.377 2005/04/13 02:03:38 krw Exp $ # $NetBSD: install.sub,v 1.5.2.8 1996/09/02 23:25:02 pk Exp $ # # Copyright (c) 1997-2005 Todd Miller, Theo de Raadt, Ken Westerback @@ -89,8 +89,14 @@ set_term() { [[ -x /sbin/kbd ]] || return _tables=$(bsort $(kbd -l | egrep -v "^(user|tables|encoding)")) - ask_which "kbd(8) table" "best matches your keyboard" "$_tables" us - [[ $resp != @(done|us) ]] && kbd $resp && echo $resp >/tmp/kbdtype + while :; do + ask "kbd(8) mapping? ('?' for list)" "none" + case $resp in + none) return ;; + "?") echo "Major tables: $_tables" ;; + *) kbd $resp && { echo $resp >/tmp/kbdtype ; return ; } ;; + esac + done } welcome() { @@ -386,7 +392,7 @@ bsort() { done # Output the smallest value found. - echo "$_a " + echo -n "$_a " # Sort remaining values. bsort $_l |