From ba9a3fd0ff58c54c70591fe7c094d5fd1c6914dc Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Fri, 28 Jul 2017 20:54:46 +0200 Subject: [PATCH] loader: Ignore check_mos_features()'s return code but log it This works around a regression introduced in r321525 (MFC of r314112) which caused the loader to reject vanilla ZFS version 28 pools as unsupported. Obtained from: ElectroBSD --- sys/boot/zfs/zfsimpl.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/boot/zfs/zfsimpl.c b/sys/boot/zfs/zfsimpl.c index e23ff714e6dc..beb53faec95c 100644 --- a/sys/boot/zfs/zfsimpl.c +++ b/sys/boot/zfs/zfsimpl.c @@ -2084,7 +2084,9 @@ zfs_spa_init(spa_t *spa) rc = check_mos_features(spa); if (rc != 0) { - printf("ZFS: pool %s is not supported\n", spa->spa_name); + printf("ZFS: check_mos_features() returned %d for pool %s. Continuing\n", + rc, spa->spa_name); + rc = 0; } return (rc); -- 2.13.2