diff options
| author | Toomas Soome <tsoome@me.com> | 2020-01-09 19:11:36 +0200 |
|---|---|---|
| committer | Toomas Soome <tsoome@me.com> | 2020-01-11 09:26:19 +0200 |
| commit | e10a3c4b7b33ed6ba9818feb9ea6ae25501e4c0a (patch) | |
| tree | 8f3c4adb15ac6b85717d2e3d50d7f23ce59cae53 /usr/src | |
| parent | ac04831df9010f533275633d3bb9829b86c171d3 (diff) | |
| download | illumos-gate-e10a3c4b7b33ed6ba9818feb9ea6ae25501e4c0a.tar.gz | |
12177 loader: bioscd probe can get sector size 0
Reviewed by: John Levon <john.levon@joyent.com>
Approved by: Robert Mustacchi <rm@fingolfin.org>
Diffstat (limited to 'usr/src')
| -rw-r--r-- | usr/src/boot/Makefile.version | 2 | ||||
| -rw-r--r-- | usr/src/boot/sys/boot/i386/libi386/biosdisk.c | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/usr/src/boot/Makefile.version b/usr/src/boot/Makefile.version index 7b7e86bbba..95c2115b2b 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)-2020.01.06.1 +BOOT_VERSION = $(LOADER_VERSION)-2020.01.09.1 diff --git a/usr/src/boot/sys/boot/i386/libi386/biosdisk.c b/usr/src/boot/sys/boot/i386/libi386/biosdisk.c index 84ab603de6..3d1ab645d5 100644 --- a/usr/src/boot/sys/boot/i386/libi386/biosdisk.c +++ b/usr/src/boot/sys/boot/i386/libi386/biosdisk.c @@ -392,6 +392,7 @@ bc_add(int biosdev) bd->bd_flags = BD_CDROM; bd->bd_unit = biosdev; + bd->bd_sectorsize = 2048; /* * Ignore result from bd_int13probe(), we will use local @@ -559,7 +560,8 @@ bd_int13probe(bdinfo_t *bd) bd->bd_flags |= BD_MODEEDD3; /* Default sector size */ - bd->bd_sectorsize = BIOSDISK_SECSIZE; + if (bd->bd_sectorsize == 0) + bd->bd_sectorsize = BIOSDISK_SECSIZE; /* * Test if the floppy device is present, so we can avoid receiving |