From 64a170cf91c8d267e7707c00ac13639160db85cd Mon Sep 17 00:00:00 2001 From: Toomas Soome Date: Sat, 4 Aug 2018 14:10:47 +0300 Subject: 9703 loader: stage1 should not probe floppies for zfs Reviewed by: Yuri Pankov Approved by: Robert Mustacchi --- usr/src/boot/Makefile.version | 2 +- usr/src/boot/sys/boot/i386/gptzfsboot/zfsboot.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'usr/src') diff --git a/usr/src/boot/Makefile.version b/usr/src/boot/Makefile.version index 35ba239a9b..5774ebbc44 100644 --- a/usr/src/boot/Makefile.version +++ b/usr/src/boot/Makefile.version @@ -33,4 +33,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)-2018.7.22.1 +BOOT_VERSION = $(LOADER_VERSION)-2018.8.04.1 diff --git a/usr/src/boot/sys/boot/i386/gptzfsboot/zfsboot.c b/usr/src/boot/sys/boot/i386/gptzfsboot/zfsboot.c index 20a4fcd44c..3888766ad8 100644 --- a/usr/src/boot/sys/boot/i386/gptzfsboot/zfsboot.c +++ b/usr/src/boot/sys/boot/i386/gptzfsboot/zfsboot.c @@ -724,6 +724,8 @@ i386_zfs_probe(void) for (unit = 0; unit < MAXBDDEV; unit++) { if (bd_unit2bios(unit) == -1) break; + if (bd_unit2bios(unit) < 0x80) + continue; sprintf(devname, "disk%d:", unit); /* If this is not boot disk, use generic probe. */ -- cgit v1.2.3