From 553cfb3f8c093d0ed24226e160562648609d7f2f Mon Sep 17 00:00:00 2001 From: Toomas Soome Date: Fri, 4 Dec 2020 00:02:13 +0200 Subject: 13344 loader: zfs_probe_partition should skip EFI System Partition Reviewed by: Yuri Pankov Reviewed by: Andy Fiddaman Approved by: Robert Mustacchi --- usr/src/boot/Makefile.version | 2 +- usr/src/boot/lib/libstand/zfs/zfs.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/usr/src/boot/Makefile.version b/usr/src/boot/Makefile.version index fd51c7e769..fc7a80ffa7 100644 --- a/usr/src/boot/Makefile.version +++ b/usr/src/boot/Makefile.version @@ -34,4 +34,4 @@ LOADER_VERSION = 1.1 # Use date like formatting here, YYYY.MM.DD.XX, without leading zeroes. # The version is processed from left to right, the version number can only # be increased. -BOOT_VERSION = $(LOADER_VERSION)-2020.11.27.2 +BOOT_VERSION = $(LOADER_VERSION)-2020.12.04.1 diff --git a/usr/src/boot/lib/libstand/zfs/zfs.c b/usr/src/boot/lib/libstand/zfs/zfs.c index 0e0af60831..5cd79253e9 100644 --- a/usr/src/boot/lib/libstand/zfs/zfs.c +++ b/usr/src/boot/lib/libstand/zfs/zfs.c @@ -642,6 +642,7 @@ zfs_probe_partition(void *arg, const char *partname, /* filter out partitions *not* used by zfs */ switch (part->type) { + case PART_EFI: /* efi system partition */ case PART_RESERVED: /* efi reserverd */ case PART_VTOC_BOOT: /* vtoc boot area */ case PART_VTOC_SWAP: -- cgit v1.2.3