diff options
| author | Toomas Soome <tsoome@me.com> | 2020-10-15 16:50:39 +0300 |
|---|---|---|
| committer | Toomas Soome <tsoome@me.com> | 2021-07-30 12:14:00 +0300 |
| commit | 5dfe3bc3a91b2e1069f643e17f6213f089f5979b (patch) | |
| tree | 6d8e009956e3a79744eec7f59d716689de3951ae /usr/src | |
| parent | 6d317d2f8bc347904716264ebe052812c3fc217a (diff) | |
| download | illumos-gate-5dfe3bc3a91b2e1069f643e17f6213f089f5979b.tar.gz | |
13974 gptzfsboot: fall back device name is always disk-1:
Reviewed by: C Fraire <cfraire@me.com>
Reviewed by: Andy Fiddaman <andy@omnios.org>
Approved by: Hans Rosenfeld <rosenfeld@grumpf.hope-2000.org>
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 | 12 |
2 files changed, 10 insertions, 4 deletions
diff --git a/usr/src/boot/Makefile.version b/usr/src/boot/Makefile.version index 1f4b347809..075e62d936 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)-2021.07.27.1 +BOOT_VERSION = $(LOADER_VERSION)-2021.07.28.1 diff --git a/usr/src/boot/sys/boot/i386/gptzfsboot/zfsboot.c b/usr/src/boot/sys/boot/i386/gptzfsboot/zfsboot.c index a8278eec04..65141c52fd 100644 --- a/usr/src/boot/sys/boot/i386/gptzfsboot/zfsboot.c +++ b/usr/src/boot/sys/boot/i386/gptzfsboot/zfsboot.c @@ -183,9 +183,15 @@ main(void) bootinfo.bi_memsizes_valid++; bootinfo.bi_bios_dev = *(uint8_t *)PTOV(ARGS); - /* Set up fall back device name. */ - snprintf(boot_devname, sizeof (boot_devname), "disk%d:", - bd_bios2unit(bootinfo.bi_bios_dev)); + /* + * Set up fall back device name. bd_bios2unit() is not available yet. + */ + if (bootinfo.bi_bios_dev < 0x80) + snprintf(boot_devname, sizeof (boot_devname), "disk%d:", + bootinfo.bi_bios_dev); + else + snprintf(boot_devname, sizeof (boot_devname), "disk%d:", + bootinfo.bi_bios_dev - 0x80); for (i = 0; devsw[i] != NULL; i++) if (devsw[i]->dv_init != NULL) |