From 3986bee147cae9ee9ce2d9a28c28b1370ac19ec6 Mon Sep 17 00:00:00 2001 From: avg Date: Sat, 26 Jan 2013 10:34:17 +0000 Subject: spa_generate_rootconf: add support for old vdev labels It seems that old ZFS versions (v15) completely omit "vdev_children" property when there is a single child. Reported by: jase Tested by: jase MFC after: 1 week --- sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c index 4392ea8..8da3f0e 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c +++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c @@ -3792,9 +3792,8 @@ spa_generate_rootconf(const char *name) /* * Multi-vdev root pool configuration discovery is not supported yet. */ - nchildren = 0; - VERIFY(nvlist_lookup_uint64(best_cfg, ZPOOL_CONFIG_VDEV_CHILDREN, - &nchildren) == 0); + nchildren = 1; + nvlist_lookup_uint64(best_cfg, ZPOOL_CONFIG_VDEV_CHILDREN, &nchildren); holes = NULL; nvlist_lookup_uint64_array(best_cfg, ZPOOL_CONFIG_HOLE_ARRAY, &holes, &nholes); -- cgit v1.1