Index: usr.sbin/bsdinstall/scripts/zfsboot
===================================================================
--- usr.sbin/bsdinstall/scripts/zfsboot
+++ usr.sbin/bsdinstall/scripts/zfsboot
@@ -868,7 +868,7 @@
 
 			# 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}"