diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2006-08-29 01:02:50 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2006-08-29 01:02:50 +0000 |
| commit | 50b8dfe608e02c89a45ae0b5a1274d805a497b7d (patch) | |
| tree | fc175fa79227de88a4cd66a475a9ab37c18b5061 /distrib | |
| parent | f8a342fe2632cc13e9f66bdaeed6ac73d0685ca5 (diff) | |
Handle site${VERSION}-$(hostname -s).tgz files better so that they
don't get in the way of noticing that all default sets are installed.
Restores the desired behaviour where [done] becomes the default answer
to the "Location of sets?" question once all default sets are
successfully installed.
spotted by & ok deraadt@
Diffstat (limited to 'distrib')
| -rw-r--r-- | distrib/miniroot/install.sh | 3 | ||||
| -rw-r--r-- | distrib/miniroot/install.sub | 5 | ||||
| -rw-r--r-- | distrib/miniroot/upgrade.sh | 3 |
3 files changed, 5 insertions, 6 deletions
diff --git a/distrib/miniroot/install.sh b/distrib/miniroot/install.sh index e7ed797fd96..c3d25ee0d79 100644 --- a/distrib/miniroot/install.sh +++ b/distrib/miniroot/install.sh @@ -1,5 +1,5 @@ #!/bin/ksh -# $OpenBSD: install.sh,v 1.153 2006/06/23 21:43:19 krw Exp $ +# $OpenBSD: install.sh,v 1.154 2006/08/29 01:02:49 krw Exp $ # $NetBSD: install.sh,v 1.5.2.8 1996/08/27 18:15:05 gwr Exp $ # # Copyright (c) 1997-2004 Todd Miller, Theo de Raadt, Ken Westerback @@ -321,7 +321,6 @@ mount_fs "-o async" ask_until "\nSystem hostname? (short form, e.g. 'foo')" "$(hostname -s)" [[ ${resp%%.*} != $(hostname -s) ]] && hostname $resp THESETS="$THESETS site$VERSION-$(hostname -s).tgz" -DEFAULTSETS="$DEFAULTSETS site$VERSION-$(hostname -s).tgz" # Remove existing network configuration files in /tmp to ensure they don't leak # onto the installed system in the case of a restarted install. Any information diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub index 38550334201..54d11b03ec0 100644 --- a/distrib/miniroot/install.sub +++ b/distrib/miniroot/install.sub @@ -1,4 +1,4 @@ -# $OpenBSD: install.sub,v 1.405 2006/07/26 20:34:11 deraadt Exp $ +# $OpenBSD: install.sub,v 1.406 2006/08/29 01:02:49 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 @@ -932,7 +932,8 @@ install_files() { for _f in $THESETS; do isin $_f $_files || continue; _sets=$(addel $_f $_sets) - isin $_f $DEFAULTSETS && _get_sets=$(addel $_f $_get_sets) + isin $_f $DEFAULTSETS "site$VERSION-$(hostname -s).tgz" && \ + _get_sets=$(addel $_f $_get_sets) done if [[ -z $_sets ]]; then diff --git a/distrib/miniroot/upgrade.sh b/distrib/miniroot/upgrade.sh index e43b7ae6447..e8e2f64d703 100644 --- a/distrib/miniroot/upgrade.sh +++ b/distrib/miniroot/upgrade.sh @@ -1,5 +1,5 @@ #!/bin/ksh -# $OpenBSD: upgrade.sh,v 1.63 2006/06/23 21:43:19 krw Exp $ +# $OpenBSD: upgrade.sh,v 1.64 2006/08/29 01:02:49 krw Exp $ # $NetBSD: upgrade.sh,v 1.2.4.5 1996/08/27 18:15:08 gwr Exp $ # # Copyright (c) 1997-2004 Todd Miller, Theo de Raadt, Ken Westerback @@ -84,7 +84,6 @@ for _file in fstab hosts myname; do done hostname $(stripcom /tmp/myname) THESETS="$THESETS site$VERSION-$(hostname -s).tgz" -DEFAULTSETS="$DEFAULTSETS site$VERSION-$(hostname -s).tgz" ask_yn "Enable network using configuration stored on root filesystem?" yes [[ $resp == y ]] && enable_network |