summaryrefslogtreecommitdiff
path: root/distrib/miniroot
diff options
context:
space:
mode:
authorKenneth R Westerback <krw@cvs.openbsd.org>2011-03-22 19:20:17 +0000
committerKenneth R Westerback <krw@cvs.openbsd.org>2011-03-22 19:20:17 +0000
commit79f1d154da7c17f0f72a749df6910ab5fca0035b (patch)
treebbf00cbd5af3a37ca4f6f71cfb401f18401f359f /distrib/miniroot
parente7df29e5985f742cda84bc27249e403d3f215d0c (diff)
Pay attention to result of amd64/i386 installboot(8). Warn user
when they won't be able to boot the installed root disk. Move installboot invocation to just before congratulation on sucess is emitted. Thus the installed partition will be 'complete' if it ever is booted. "go for it" deraadt@
Diffstat (limited to 'distrib/miniroot')
-rw-r--r--distrib/miniroot/install.sub6
1 files changed, 3 insertions, 3 deletions
diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub
index 3498e8cd4a3..ddbc64bd16c 100644
--- a/distrib/miniroot/install.sub
+++ b/distrib/miniroot/install.sub
@@ -1,4 +1,4 @@
-# $OpenBSD: install.sub,v 1.635 2011/02/25 12:55:45 krw Exp $
+# $OpenBSD: install.sub,v 1.636 2011/03/22 19:20:15 krw Exp $
# $NetBSD: install.sub,v 1.5.2.8 1996/09/02 23:25:02 pk Exp $
#
# Copyright (c) 1997-2009 Todd Miller, Theo de Raadt, Ken Westerback
@@ -1950,12 +1950,12 @@ finish_up() {
)
echo "done."
- md_installboot $ROOTDISK
-
populateusrlocal
[ -x /mnt/$MODE.site ] && /mnt/usr/sbin/chroot /mnt /$MODE.site
+ md_installboot $ROOTDISK
+
# Pat on the back.
cat <<__EOT