From: kettenis <kettenis@openbsd.org>
Date: Sun, 13 Mar 2022 14:33:46 +0000 (+0000)
Subject: Now that fdisk(8) retains the EFI System Partition on Apple systems, skip
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=decec7d492a29f0fe0d729aa5af21f6bcec51fa4;p=openbsd

Now that fdisk(8) retains the EFI System Partition on Apple systems, skip
formatting the partition such that its contents actually survive.

ok krw@
---

diff --git a/distrib/arm64/ramdisk/install.md b/distrib/arm64/ramdisk/install.md
index 926eebe5e62..33127593329 100644
--- a/distrib/arm64/ramdisk/install.md
+++ b/distrib/arm64/ramdisk/install.md
@@ -1,4 +1,4 @@
-#	$OpenBSD: install.md,v 1.27 2022/03/06 19:35:22 kettenis Exp $
+#	$OpenBSD: install.md,v 1.28 2022/03/13 14:33:46 kettenis Exp $
 #
 #
 # Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -111,14 +111,15 @@ md_prep_fdisk() {
 			elif disk_has $_disk gpt; then
 				if [[ $_disk == $ROOTDISK ]]; then
 					fdisk -gy -b "${bootsectorsize}" ${_disk} >/dev/null
+					installboot -p $_disk
 				else
 					fdisk -gy ${_disk} >/dev/null
 				fi
 			else
 				fdisk -iy -b "${bootsectorsize}@${bootsectorstart}:${bootparttype}" ${_disk} >/dev/null
+				installboot -p $_disk
 			fi
 			echo "done."
-			installboot -p $_disk
 			return ;;
 		[eE]*)
 			if disk_has $_disk gpt; then