diff options
| author |   rpe <rpe@openbsd.org> | 2014-11-18 19:00:16 +0000 |
|---|---|---|
| committer | rpe <rpe@openbsd.org> | 2014-11-18 19:00:16 +0000 |
| commit | 868cacf67d5b06957c088e9c47cc54a15d040aa0 (patch) | |
| tree | e1549865a01cfe2eb86dace2ff6dfa9b52cdadab | |
| parent | Don't build support in perl for *dbm not in the base system (diff) | |
| download | wireguard-openbsd-868cacf67d5b06957c088e9c47cc54a15d040aa0.tar.xz wireguard-openbsd-868cacf67d5b06957c088e9c47cc54a15d040aa0.zip | |
Delete tmp directory in /mnt/var during upgrades right before the
extraction of baseXX.tgz creates the symlink to ../tmp.
OK deraadt
| -rw-r--r-- | distrib/miniroot/install.sub | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub index 7d356233bb2..43d2b9d55b0 100644 --- a/distrib/miniroot/install.sub +++ b/distrib/miniroot/install.sub @@ -1,4 +1,4 @@ -# $OpenBSD: install.sub,v 1.798 2014/11/11 21:31:29 rpe Exp $ +# $OpenBSD: install.sub,v 1.799 2014/11/18 19:00:16 rpe Exp $ # # Copyright (c) 1997-2009 Todd Miller, Theo de Raadt, Ken Westerback # All rights reserved. @@ -1307,6 +1307,10 @@ install_files() { return fi + # XXX Delete this chunk after 5.8 (not a supported upgrade path) + # XXX Undo old configurations where /var/tmp is a directory + [[ $MODE == upgrade ]] && rm -rf /mnt/var/tmp + for _f in $_get_sets; do _fsrc="$_src/$_f" [[ -f $_tmpsrc/$_f ]] && _fsrc="file://$_tmpsrc/$_f" |