Date: Fri, 13 Jul 2018 16:33:21 +0000 (UTC) From: Ian Lepore <ian@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r336242 - head/tools/boot Message-ID: <201807131633.w6DGXL1I083452@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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() {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201807131633.w6DGXL1I083452>