From 9e4047d9d92c4eef9fea421e9fc4b0f4dbc288aa Mon Sep 17 00:00:00 2001
From: Alan Somers <asomers@FreeBSD.org>
Date: Tue, 24 May 2022 12:24:12 -0600
Subject: [PATCH] bsdinstall: use gpt/efiboot0 label in /etc/fstab

Otherwise, boot will hang if the numbering of disks has changed since
initial install.

MFC after:	2 weeks
Sponsored by:	Axcient
Reviewed by:	brd
Differential Revision: https://reviews.freebsd.org/D35309

(cherry picked from commit 7919c76dbdd20161247d1bfb647110d87ca5ee0f)
---
 usr.sbin/bsdinstall/scripts/zfsboot | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr.sbin/bsdinstall/scripts/zfsboot b/usr.sbin/bsdinstall/scripts/zfsboot
index 7efa40ff8d2..14fbdd0d67f 100755
--- a/usr.sbin/bsdinstall/scripts/zfsboot
+++ b/usr.sbin/bsdinstall/scripts/zfsboot
@@ -853,7 +853,7 @@ zfs_create_diskpart()
 
 			# We'll configure the ESP in bootconfig
 			if [ -z "$efibootpart" ]; then
-				efibootpart="/dev/$(echo $justaddedpart | cut -f 1 -d ' ')"
+				efibootpart="/dev/gpt/efiboot$index"
 				f_dprintf "$funcname: configuring ESP at [%s]" \
 				          "${efibootpart}"