diff options
| author |   rpe <rpe@openbsd.org> | 2017-07-20 19:48:13 +0000 |
|---|---|---|
| committer | rpe <rpe@openbsd.org> | 2017-07-20 19:48:13 +0000 |
| commit | 2717fbc7ab706982bf36bda6c7b71be48dcaa1d2 (patch) | |
| tree | 9d1506b99d9334a25798f5680ff4819bac61f808 | |
| parent | Allow leading . in nameConstraints. from openssl via jabberwock. ok jsing (diff) | |
| download | wireguard-openbsd-2717fbc7ab706982bf36bda6c7b71be48dcaa1d2.tar.xz wireguard-openbsd-2717fbc7ab706982bf36bda6c7b71be48dcaa1d2.zip | |
Move the execution of the {install,upgrade}.site script to the end
of the install/upgrade process.
OK tb@
| -rw-r--r-- | distrib/miniroot/install.sub | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub index b6006147052..24fde13e278 100644 --- a/distrib/miniroot/install.sub +++ b/distrib/miniroot/install.sub @@ -1,5 +1,5 @@ #!/bin/ksh -# $OpenBSD: install.sub,v 1.1025 2017/07/20 09:25:59 anton Exp $ +# $OpenBSD: install.sub,v 1.1026 2017/07/20 19:48:13 rpe Exp $ # # Copyright (c) 1997-2015 Todd Miller, Theo de Raadt, Ken Westerback # Copyright (c) 2015, Robert Peichaer <rpe@openbsd.org> @@ -2639,8 +2639,6 @@ finish_up() { ) fi - [[ -x /mnt/$MODE.site ]] && chroot /mnt /$MODE.site - # In case this is a softraid device, make sure all underlying # device nodes exist before installing boot-blocks on disk. make_dev $(bioctl $ROOTDISK 2>/dev/null | sed -n 's/.*<\(.*\)>$/\1/p') @@ -2681,6 +2679,8 @@ finish_up() { # Email installer questions and their answers to root on next boot. prep_root_mail /tmp/i/$MODE.resp "$(hostname) $MODE response file" + [[ -x /mnt/$MODE.site ]] && chroot /mnt /$MODE.site + # Store entropy for the next boot. store_random |