summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjsing <jsing@openbsd.org>2014-01-19 04:11:44 +0000
committerjsing <jsing@openbsd.org>2014-01-19 04:11:44 +0000
commit25b3044e2da0dcefabf6a879eca909296456083b (patch)
treea7257934422fc449a554bebda28c7e4d82cbaa5c
parentSwitch amd64 installs/upgrades to the new installboot. (diff)
downloadwireguard-openbsd-25b3044e2da0dcefabf6a879eca909296456083b.tar.xz
wireguard-openbsd-25b3044e2da0dcefabf6a879eca909296456083b.zip
Use the new installboot when building amd64 media.
-rw-r--r--distrib/amd64/common/Makefile.inc7
1 files changed, 3 insertions, 4 deletions
diff --git a/distrib/amd64/common/Makefile.inc b/distrib/amd64/common/Makefile.inc
index 5fdb69b335c..1ab9604a965 100644
--- a/distrib/amd64/common/Makefile.inc
+++ b/distrib/amd64/common/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.23 2013/10/15 22:46:48 deraadt Exp $
+# $OpenBSD: Makefile.inc,v 1.24 2014/01/19 04:11:44 jsing Exp $
TOP= ${.CURDIR}/..
@@ -35,10 +35,9 @@ ${FS}: bsd.gz
cp ${BOOT} ${.OBJDIR}/boot
strip ${.OBJDIR}/boot
strip -R .comment ${.OBJDIR}/boot
- dd if=${.OBJDIR}/boot of=${MOUNT_POINT}/boot bs=512
dd if=bsd.gz of=${MOUNT_POINT}/bsd bs=512
- /usr/mdec/installboot -v ${MOUNT_POINT}/boot \
- ${DESTDIR}/usr/mdec/biosboot ${VND_CRDEV}
+ installboot -v -r ${MOUNT_POINT} ${VND_CRDEV} \
+ ${DESTDIR}/usr/mdec/biosboot ${.OBJDIR}/boot
@echo ""
@df -i ${MOUNT_POINT}
@echo ""