diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2007-03-04 14:37:38 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2007-03-04 14:37:38 +0000 |
| commit | dfd91a93ba596850b0c3e7848983c603675fb5cb (patch) | |
| tree | 0b67f9620b48973c37787e1fbf248bcf6c76cc12 | |
| parent | 7d2c1a5c284fb9788b26240535c2a92062ef2f56 (diff) | |
If INSTALL.<arch> isn't present at the given set location, give the
user a chance to bail out before selecting sets to install. Just in
case the user ended up in the wrong directory.
Suggested by beck@, feedback from various.
"emphatic ok" beck@ "go for it" deraadt@
| -rw-r--r-- | distrib/miniroot/install.sub | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub index 1bb46c4c497..44764a0fb5a 100644 --- a/distrib/miniroot/install.sub +++ b/distrib/miniroot/install.sub @@ -1,4 +1,4 @@ -# $OpenBSD: install.sub,v 1.410 2007/03/01 03:51:56 deraadt Exp $ +# $OpenBSD: install.sub,v 1.411 2007/03/04 14:37:37 krw Exp $ # $NetBSD: install.sub,v 1.5.2.8 1996/09/02 23:25:02 pk Exp $ # # Copyright (c) 1997-2006 Todd Miller, Theo de Raadt, Ken Westerback @@ -950,6 +950,11 @@ __EOT return fi + resp=y + isin INSTALL.$ARCH $_files || + ask_yn "INSTALL.$ARCH not found. Use sets found here anyway?" + [[ $resp = n ]] && return + select_sets "$_sets" "$_get_sets" [[ -n $resp ]] || return |