diff options
Diffstat (limited to 'stand/efi/loader/main.c')
| -rw-r--r-- | stand/efi/loader/main.c | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/stand/efi/loader/main.c b/stand/efi/loader/main.c index 8419331f7a19..872f78ba82b2 100644 --- a/stand/efi/loader/main.c +++ b/stand/efi/loader/main.c @@ -250,9 +250,9 @@ sanity_check_currdev(void) static bool probe_zfs_currdev(uint64_t guid) { + char buf[VDEV_PAD_SIZE]; char *devname; struct zfs_devdesc currdev; - bool bootable; currdev.dd.d_dev = &zfs_dev; currdev.dd.d_unit = 0; @@ -262,19 +262,14 @@ probe_zfs_currdev(uint64_t guid) devname = devformat(&currdev.dd); init_zfs_boot_options(devname); - bootable = sanity_check_currdev(); - if (bootable) { - char buf[VDEV_PAD_SIZE]; - - if (zfs_get_bootonce(&currdev, OS_BOOTONCE, buf, sizeof(buf)) == 0) { - printf("zfs bootonce: %s\n", buf); - set_currdev(buf); - setenv("zfs-bootonce", buf, 1); - } + if (zfs_get_bootonce(&currdev, OS_BOOTONCE, buf, sizeof(buf)) == 0) { + printf("zfs bootonce: %s\n", buf); + set_currdev(buf); + setenv("zfs-bootonce", buf, 1); (void)zfs_attach_nvstore(&currdev); } - return (bootable); + return (sanity_check_currdev()); } #endif |