summaryrefslogtreecommitdiff
path: root/distrib/i386/common
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/i386/common
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/i386/common')
-rw-r--r--distrib/i386/common/install.md8
1 files changed, 6 insertions, 2 deletions
diff --git a/distrib/i386/common/install.md b/distrib/i386/common/install.md
index 92b68533167..37dcd4b19a0 100644
--- a/distrib/i386/common/install.md
+++ b/distrib/i386/common/install.md
@@ -1,4 +1,4 @@
-# $OpenBSD: install.md,v 1.50 2011/01/03 00:36:49 deraadt Exp $
+# $OpenBSD: install.md,v 1.51 2011/03/22 19:20:16 krw Exp $
#
#
# Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -48,7 +48,11 @@ md_installboot() {
# LBA biosboot uses /boot's i-node number. Using 'cat' preserves that
# number, so multiboot setups (NTLDR) can work across upgrades.
cat /usr/mdec/boot >/mnt/boot
- /usr/mdec/installboot /mnt/boot /usr/mdec/biosboot ${1}
+ if ! /usr/mdec/installboot /mnt/boot /usr/mdec/biosboot ${1} ; then
+ echo "\nFailed to install bootblocks."
+ echo "You will not be able to boot OpenBSD from ${1}."
+ exit
+ fi
}
md_prep_fdisk() {