From: visa <visa@openbsd.org>
Date: Sat, 19 Feb 2022 08:33:28 +0000 (+0000)
Subject: Use installboot(8) in install.md of armv7.
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=122b416be930002aae0fc7c2a2bdb3ea2338a93c;p=openbsd

Use installboot(8) in install.md of armv7.

OK kettenis@ deraadt@
---

diff --git a/distrib/armv7/ramdisk/install.md b/distrib/armv7/ramdisk/install.md
index 999dc7f99e0..6c35ad4c56c 100644
--- a/distrib/armv7/ramdisk/install.md
+++ b/distrib/armv7/ramdisk/install.md
@@ -1,4 +1,4 @@
-#	$OpenBSD: install.md,v 1.51 2022/02/07 20:24:30 krw Exp $
+#	$OpenBSD: install.md,v 1.52 2022/02/19 08:33:28 visa Exp $
 #
 # Copyright (c) 1996 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -31,7 +31,6 @@
 # machine dependent section of installation/upgrade script.
 #
 
-NEWFSARGS_msdos="-F 16 -L boot"
 MOUNT_ARGS_msdos="-o-l"
 
 md_installboot() {
@@ -47,10 +46,14 @@ md_installboot() {
 	*)				;; # XXX: Handle unknown platform?
 	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
+
+	# Apply some final tweaks on selected platforms
 	mount ${MOUNT_ARGS_msdos} ${_disk}i /mnt/mnt
-	mkdir -p /mnt/mnt/efi/boot
-	cp /mnt/usr/mdec/BOOTARM.EFI /mnt/mnt/efi/boot/bootarm.efi
 
 	_mdec=/usr/mdec/$_plat
 
@@ -82,6 +85,8 @@ md_installboot() {
 		    bs=1024 seek=8 >/dev/null 2>&1
 		;;
 	esac
+
+	umount /mnt/mnt
 }
 
 md_prep_fdisk() {
@@ -91,7 +96,6 @@ md_prep_fdisk() {
 	local bootsectorstart="32768"
 	local bootsectorsize="32768"
 	local bootfstype="msdos"
-	local newfs_args=${NEWFSARGS_msdos}
 
 	while :; do
 		_d=whole
@@ -106,8 +110,7 @@ md_prep_fdisk() {
 			echo -n "Creating a ${bootfstype} partition and an OpenBSD partition for rest of $_disk..."
 			fdisk -iy -b "${bootsectorsize}@${bootsectorstart}:${bootparttype}" ${_disk} >/dev/null
 			echo "done."
-			disklabel $_disk 2>/dev/null | grep -q "^  i:" || disklabel -w -d $_disk
-			newfs -t ${bootfstype} ${newfs_args} ${_disk}i
+			installboot -p $_disk
 			return ;;
 		[eE]*)
 			# Manually configure the MBR.
diff --git a/distrib/armv7/ramdisk/list b/distrib/armv7/ramdisk/list
index f66ea1a5e56..3d3dfff0df9 100644
--- a/distrib/armv7/ramdisk/list
+++ b/distrib/armv7/ramdisk/list
@@ -1,4 +1,4 @@
-#	$OpenBSD: list,v 1.46 2021/10/04 01:34:29 kevlo Exp $
+#	$OpenBSD: list,v 1.47 2022/02/19 08:33:28 visa Exp $
 
 SRCDIRS distrib/special
 
@@ -63,6 +63,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/mkuboot
 LINK	instbin					usr/sbin/pwd_mkdb
 ARGVLINK ksh					-sh