diff options
| author | Theo Buehler <tb@cvs.openbsd.org> | 2019-03-02 17:33:19 +0000 |
|---|---|---|
| committer | Theo Buehler <tb@cvs.openbsd.org> | 2019-03-02 17:33:19 +0000 |
| commit | 8f362dacb0bb6804a0fdba4ee4578e4b10406a2a (patch) | |
| tree | c1ddb73b164462a839d4f8ed9f03b8bf15c2be30 | |
| parent | a87787b70d5eeba1e5ac3ab830c048171d9051c8 (diff) | |
On upgrade, only clean up the library relinking kits when we know
that a new one will be installed (i.e., base*.tgz was selected).
'makes sense' deraadt
| -rw-r--r-- | distrib/miniroot/install.sub | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub index 0f4fb64229c..3e08a41c1a8 100644 --- a/distrib/miniroot/install.sub +++ b/distrib/miniroot/install.sub @@ -1,5 +1,5 @@ #!/bin/ksh -# $OpenBSD: install.sub,v 1.1110 2019/02/11 17:51:53 deraadt Exp $ +# $OpenBSD: install.sub,v 1.1111 2019/03/02 17:33:18 tb Exp $ # # Copyright (c) 1997-2015 Todd Miller, Theo de Raadt, Ken Westerback # Copyright (c) 2015, Robert Peichaer <rpe@openbsd.org> @@ -1640,6 +1640,10 @@ install_files() { return fi + if [[ $MODE == upgrade ]] && isin base$VERSION.tgz $_get_sets; then + rm -f /mnt/usr/share/relink/usr/lib/* + fi + # Install the set files. for _f in $_get_sets; do _fsrc="$_src/$_f" @@ -3169,8 +3173,6 @@ do_upgrade() { # Ensure that previous installer choices (e.g. method) are available. wait_cgiinfo - rm -f /mnt/usr/share/relink/usr/lib/* - # Ask the user for locations, and install whatever sets the user # selected. install_sets |