diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2009-04-30 02:42:46 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2009-04-30 02:42:46 +0000 |
| commit | 99feaf0f4fe87887035e79403f9efbbdea2d8af9 (patch) | |
| tree | d0a87dddd322e99e1815f079bff6cbc5f1381445 /distrib | |
| parent | 781bcfd403e526ac732587eda792252a075a62c6 (diff) | |
since the installer now chooses the sets mostly by itself, the default
operation in the sets menu should be "done".
ok @krw with a tear in his eye
Diffstat (limited to 'distrib')
| -rw-r--r-- | distrib/miniroot/install.sub | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub index 6e35a4e783d..f214cb57b04 100644 --- a/distrib/miniroot/install.sub +++ b/distrib/miniroot/install.sub @@ -1,4 +1,4 @@ -# $OpenBSD: install.sub,v 1.502 2009/04/30 01:03:28 deraadt Exp $ +# $OpenBSD: install.sub,v 1.503 2009/04/30 02:42:45 deraadt 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 @@ -516,7 +516,7 @@ addhostent() { # # Set $resp to list of selected sets. select_sets() { - local _avail=$1 _selected=$2 _next _f _action _col _p + local _avail=$1 _selected=$2 _f _action _col _p typeset -L18 _l cat <<__EOT @@ -527,14 +527,12 @@ sets are labelled '[X]'. __EOT while :; do _action= - _next= _col=0 for _f in $_avail; do if isin $_f $_selected; then _p="[X] $_f" else _p="[ ] $_f" - : ${_next:=$_f} fi if (( _col == 0 )); then echo -n ' ' @@ -559,9 +557,8 @@ __EOT # complete a partial column echo fi - : ${_next:=done} - ask "Set name? (or 'abort' or 'done')" "$_next" + ask "Set name? (or 'abort' or 'done')" done case $resp in abort) _selected= break ;; |