diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2004-06-20 05:13:15 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2004-06-20 05:13:15 +0000 |
| commit | 8f7d467acaabccac369fa81f4ed9b008e31206b6 (patch) | |
| tree | 26c6ab8f185c0a2f4d0c29c4dfa7eabf64534480 | |
| parent | d59680422e8a6bbde084969af51a2acb41bb8999 (diff) | |
If all default sets have been successfully installed, make [done] the
default answer to 'Where are the install sets?'.
Requested by various, most recently Henning and Theo.
| -rw-r--r-- | distrib/miniroot/install.sub | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub index 7bc2df0a5ec..d1bcff1ca39 100644 --- a/distrib/miniroot/install.sub +++ b/distrib/miniroot/install.sub @@ -1,4 +1,4 @@ -# $OpenBSD: install.sub,v 1.339 2004/06/13 22:00:50 deraadt Exp $ +# $OpenBSD: install.sub,v 1.340 2004/06/20 05:13:14 krw Exp $ # $NetBSD: install.sub,v 1.5.2.8 1996/09/02 23:25:02 pk Exp $ # # Copyright (c) 1997-2004 Todd Miller, Theo de Raadt, Ken Westerback @@ -1433,6 +1433,8 @@ __EOT # user selects from that location. Repeat as many times as the user # needs to get all desired sets. install_sets() { + local _d + cat << __EOT You will now specify the location and names of the ${MODE} sets you want to @@ -1442,12 +1444,14 @@ installation notes for details on the contents of each. __EOT while : ; do + _d= cat << __EOT Sets can be located on a (m)ounted filesystem; a (c)drom, (d)isk or (t)ape device; or a (f)tp, (n)fs or (h)ttp server. __EOT - ask "Where are the ${MODE} sets? (or 'done')" + [[ -z $DEFAULTSETS ]] && _d=done + ask "Where are the $MODE sets? (or 'done')" "$_d" case $resp in done) sane_install && return ;; |