diff options
| author | Toomas Soome <tsoome@me.com> | 2018-08-04 14:10:47 +0300 |
|---|---|---|
| committer | Robert Mustacchi <rm@joyent.com> | 2018-08-16 20:35:01 +0000 |
| commit | 64a170cf91c8d267e7707c00ac13639160db85cd (patch) | |
| tree | 1a0097a862c5771570818ce8df057c4642e78491 /usr/src | |
| parent | 843ead088f87e5e766084646370e981f176eb323 (diff) | |
| download | illumos-joyent-64a170cf91c8d267e7707c00ac13639160db85cd.tar.gz | |
9703 loader: stage1 should not probe floppies for zfs
Reviewed by: Yuri Pankov <yuripv@yuripv.net>
Approved by: Robert Mustacchi <rm@joyent.com>
Diffstat (limited to 'usr/src')
| -rw-r--r-- | usr/src/boot/Makefile.version | 2 | ||||
| -rw-r--r-- | usr/src/boot/sys/boot/i386/gptzfsboot/zfsboot.c | 2 |
2 files changed, 3 insertions, 1 deletions
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. */ |