diff options
| author |   deraadt <deraadt@openbsd.org> | 2009-04-18 01:07:48 +0000 |
|---|---|---|
| committer | deraadt <deraadt@openbsd.org> | 2009-04-18 01:07:48 +0000 |
| commit | beaa16ee90cfe9b6fdeac34b598e2b6f9027a04a (patch) | |
| tree | e7083f77fb5bda890a29b0ab946d0bbfda2b3433 | |
| parent | 18 characters per column is better, since xshareXX.tgz is a long name. (diff) | |
| download | wireguard-openbsd-beaa16ee90cfe9b6fdeac34b598e2b6f9027a04a.tar.xz wireguard-openbsd-beaa16ee90cfe9b6fdeac34b598e2b6f9027a04a.zip | |
Get rid of the final "Are you ready to install sets?" question by adding
an 'abort' option to the previous question. Another question goes *poof*
ok krw
| -rw-r--r-- | distrib/miniroot/install.sub | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub index 494ccf97464..32774b0bd21 100644 --- a/distrib/miniroot/install.sub +++ b/distrib/miniroot/install.sub @@ -1,4 +1,4 @@ -# $OpenBSD: install.sub,v 1.460 2009/04/18 00:42:28 deraadt Exp $ +# $OpenBSD: install.sub,v 1.461 2009/04/18 01:07:48 deraadt Exp $ # $NetBSD: install.sub,v 1.5.2.8 1996/09/02 23:25:02 pk Exp $ # # Copyright (c) 1997-2007 Todd Miller, Theo de Raadt, Ken Westerback @@ -525,8 +525,10 @@ __EOT fi : ${_next:=done} - ask "Set name? (or 'done')" "$_next" + ask "Set name? (or 'abort' or 'done')" "$_next" case $resp in + abort) _selected= + break ;; done) break ;; -*) _action=rmel ;; esac @@ -954,7 +956,6 @@ __EOT shacmd="cat" [[ -x /bin/sha256 ]] && shacmd="sha256 /tmp/h" - ask_yn "Ready to $MODE sets?" yes for _f in $THESETS ; do isin $_f $_get_sets || continue echo -n "Getting $_f ..." |