From owner-svn-src-head@freebsd.org  Fri Jul 13 16:33:22 2018
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8D646104326A;
 Fri, 13 Jul 2018 16:33:22 +0000 (UTC) (envelope-from ian@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 3883D8DA4D;
 Fri, 13 Jul 2018 16:33:22 +0000 (UTC) (envelope-from ian@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1B1BF12B61;
 Fri, 13 Jul 2018 16:33:22 +0000 (UTC) (envelope-from ian@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w6DGXL3F083453;
 Fri, 13 Jul 2018 16:33:21 GMT (envelope-from ian@FreeBSD.org)
Received: (from ian@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w6DGXL1I083452;
 Fri, 13 Jul 2018 16:33:21 GMT (envelope-from ian@FreeBSD.org)
Message-Id: <201807131633.w6DGXL1I083452@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ian set sender to ian@FreeBSD.org
 using -f
From: Ian Lepore <ian@FreeBSD.org>
Date: Fri, 13 Jul 2018 16:33:21 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r336242 - head/tools/boot
X-SVN-Group: head
X-SVN-Commit-Author: ian
X-SVN-Commit-Paths: head/tools/boot
X-SVN-Commit-Revision: 336242
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.27
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 13 Jul 2018 16:33:22 -0000

Author: ian
Date: Fri Jul 13 16:33:21 2018
New Revision: 336242
URL: https://svnweb.freebsd.org/changeset/base/336242

Log:
  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'.

Modified:
  head/tools/boot/install-boot.sh

Modified: head/tools/boot/install-boot.sh
==============================================================================
--- head/tools/boot/install-boot.sh	Fri Jul 13 16:32:31 2018	(r336241)
+++ head/tools/boot/install-boot.sh	Fri Jul 13 16:33:21 2018	(r336242)
@@ -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() {