git: 7919c76dbdd2 - main - bsdinstall: use gpt/efiboot0 label in /etc/fstab

From: Alan Somers <asomers_at_FreeBSD.org>
Date: Tue, 24 May 2022 19:17:44 UTC
The branch main has been updated by asomers:

URL: https://cgit.FreeBSD.org/src/commit/?id=7919c76dbdd20161247d1bfb647110d87ca5ee0f

commit 7919c76dbdd20161247d1bfb647110d87ca5ee0f
Author:     Alan Somers <asomers@FreeBSD.org>
AuthorDate: 2022-05-24 18:24:12 +0000
Commit:     Alan Somers <asomers@FreeBSD.org>
CommitDate: 2022-05-24 19:17:10 +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
---
 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 56af9eccd78b..a98cf4a33f28 100755
--- a/usr.sbin/bsdinstall/scripts/zfsboot
+++ b/usr.sbin/bsdinstall/scripts/zfsboot
@@ -868,7 +868,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}"