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'.
This commit is contained in:
Ian Lepore 2018-07-13 16:33:21 +00:00
parent 7b4b55e520
commit 394641cf3d
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=336242

View File

@ -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() {