git: 9e4047d9d92c - stable/13 - bsdinstall: use gpt/efiboot0 label in /etc/fstab

From: Alan Somers <asomers_at_FreeBSD.org>
Date: Sun, 24 Jul 2022 15:40:40 UTC 
The branch stable/13 has been updated by asomers:

URL: https://cgit.FreeBSD.org/src/commit/?id=9e4047d9d92c4eef9fea421e9fc4b0f4dbc288aa

commit 9e4047d9d92c4eef9fea421e9fc4b0f4dbc288aa
Author:     Alan Somers <asomers@FreeBSD.org>
AuthorDate: 2022-05-24 18:24:12 +0000
Commit:     Alan Somers <asomers@FreeBSD.org>
CommitDate: 2022-07-24 15:39:26 +0000

    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 7efa40ff8d20..14fbdd0d67fb 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}"