From 394641cf3d2fd8422a6ee79a73d7eca857bddb2e Mon Sep 17 00:00:00 2001
From: Ian Lepore <ian@FreeBSD.org>
Date: Fri, 13 Jul 2018 16:33:21 +0000
Subject: [PATCH] More little fixes... fix a function name typo (eps vs esp),
 and cope with newer versions of gpart that show mbr efi partition types with
 the name 'efi' rather than as '!239'.

---
 tools/boot/install-boot.sh | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/tools/boot/install-boot.sh b/tools/boot/install-boot.sh
index 49948a1b7739..54eb6bec9760 100755
--- a/tools/boot/install-boot.sh
+++ b/tools/boot/install-boot.sh
@@ -48,7 +48,10 @@ make_esp_mbr() {
 
     s=$(find-part $dev "!239")
     if [ -z "$s" ] ; then
-	die "No ESP slice found"
+	s=$(find-part $dev "efi")
+	if [ -z "$s" ] ; then
+	    die "No ESP slice found"
+    	fi
     fi
     make_esp /dev/${dev}s${s} ${dst}
 }
@@ -149,7 +152,7 @@ boot_nogeli_mbr_zfs_legacy() {
 }
 
 boot_nogeli_mbr_zfs_uefi() {
-    make_eps_mbr $1 $2
+    make_esp_mbr $1 $2
 }
 
 boot_nogeli_mbr_zfs_both() {