diff options
| author | Mark Kettenis <kettenis@cvs.openbsd.org> | 2021-06-06 18:58:15 +0000 |
|---|---|---|
| committer | Mark Kettenis <kettenis@cvs.openbsd.org> | 2021-06-06 18:58:15 +0000 |
| commit | d10c2028501b9cc62deb5a80b53db8d4fa92e614 (patch) | |
| tree | b8a48a0bccda4b269f32c05f3baa1b125cf56b8b /distrib | |
| parent | e59ba889ee5a0af55ab9e692dbd79b3334630758 (diff) | |
Use installboot(8) on arm64 ramdisks like we do for amd64.
ok krw@
Diffstat (limited to 'distrib')
| -rw-r--r-- | distrib/arm64/ramdisk/install.md | 12 | ||||
| -rw-r--r-- | distrib/arm64/ramdisk/list | 3 |
2 files changed, 10 insertions, 5 deletions
diff --git a/distrib/arm64/ramdisk/install.md b/distrib/arm64/ramdisk/install.md index 957ca68b5b0..f444ea7c90b 100644 --- a/distrib/arm64/ramdisk/install.md +++ b/distrib/arm64/ramdisk/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.17 2021/06/03 17:08:56 kettenis Exp $ +# $OpenBSD: install.md,v 1.18 2021/06/06 18:58:14 kettenis Exp $ # # # Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -44,10 +44,14 @@ md_installboot() { raspberrypi,*) _plat=rpi; esac - # Mount MSDOS partition, extract U-Boot and copy UEFI boot program + if ! installboot -r /mnt ${1}; then + echo "\nFailed to install bootblocks." + echo "You will not be able to boot OpenBSD from ${1}." + exit + fi + + # Mount MSDOS partition to do some final tweaks mount ${MOUNT_ARGS_msdos} ${_disk}i /mnt/mnt - mkdir -p /mnt/mnt/efi/boot - cp /mnt/usr/mdec/BOOTAA64.EFI /mnt/mnt/efi/boot/bootaa64.efi echo bootaa64.efi > /mnt/mnt/efi/boot/startup.nsh _mdec=/usr/mdec/$_plat diff --git a/distrib/arm64/ramdisk/list b/distrib/arm64/ramdisk/list index f6b1356c01c..500669d77fa 100644 --- a/distrib/arm64/ramdisk/list +++ b/distrib/arm64/ramdisk/list @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.14 2021/04/17 21:19:40 sthen Exp $ +# $OpenBSD: list,v 1.15 2021/06/06 18:58:14 kettenis Exp $ SRCDIRS distrib/special @@ -61,6 +61,7 @@ LINK instbin usr/bin/sed LINK instbin usr/bin/signify LINK instbin usr/bin/tee LINK instbin usr/sbin/chroot +LINK instbin usr/sbin/installboot LINK instbin usr/sbin/pwd_mkdb ARGVLINK ksh -sh SPECIAL rm bin/md5 |