summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjsing <jsing@openbsd.org>2014-01-19 04:08:27 +0000
committerjsing <jsing@openbsd.org>2014-01-19 04:08:27 +0000
commit1962e11d37e8adf4926cd0b87356c92614bc067f (patch)
tree3b35258d999f50bee32476aa69311ec100b0e540
parentAdd usr/sbin/installboot to amd64 instbin. (diff)
downloadwireguard-openbsd-1962e11d37e8adf4926cd0b87356c92614bc067f.tar.xz
wireguard-openbsd-1962e11d37e8adf4926cd0b87356c92614bc067f.zip
Switch amd64 installs/upgrades to the new installboot.
-rw-r--r--distrib/amd64/common/install.md6
1 files changed, 2 insertions, 4 deletions
diff --git a/distrib/amd64/common/install.md b/distrib/amd64/common/install.md
index 9d73a331cca..735f5160368 100644
--- a/distrib/amd64/common/install.md
+++ b/distrib/amd64/common/install.md
@@ -1,4 +1,4 @@
-# $OpenBSD: install.md,v 1.33 2013/11/16 18:37:26 rpe Exp $
+# $OpenBSD: install.md,v 1.34 2014/01/19 04:08:27 jsing Exp $
#
#
# Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -39,9 +39,7 @@ NCPU=$(sysctl -n hw.ncpufound)
((NCPU > 1)) && { DEFAULTSETS="bsd bsd.rd bsd.mp" ; SANESETS="bsd bsd.mp" ; }
md_installboot() {
- # Use cat to avoid holes created by cp(1)
- cat /mnt/usr/mdec/boot > /mnt/boot
- if ! /mnt/usr/mdec/installboot /mnt/boot /mnt/usr/mdec/biosboot ${1} ; then
+ if ! installboot -r /mnt ${1} ; then
echo "\nFailed to install bootblocks."
echo "You will not be able to boot OpenBSD from ${1}."
exit