Author: delphij
Date: Thu Apr 4 17:10:36 2013
New Revision: 249100
URL: http://svnweb.freebsd.org/changeset/base/249100
Log:
Per Matthew Ahrens, version 5000 should not be exposed to user and there is
a problem with my first revision, namely, specifying -d -o feature@...=enable
will still bail out with:
'feature@' and 'version' properties cannot be specified together.
Because zpool create -o version=5000 will not likely be supported by other
ZFS implementations (including ours on -CURRENT and 9-STABLE), remove the
hack that make that work. Users who want feature flags support can still
do an explicit 'zpool upgrade' after creating a pool.
Modified:
stable/8/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
Modified: stable/8/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
==============================================================================
--- stable/8/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c Thu Apr 4
17:08:49 2013 (r249099)
+++ stable/8/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c Thu Apr 4
17:10:36 2013 (r249100)
@@ -865,8 +865,7 @@ zpool_do_create(int argc, char **argv)
ZPOOL_PROP_VERSION), "28", &props, B_TRUE))
goto errout;
enable_all_pool_feat = B_FALSE;
- } else if (enable_all_pool_feat)
- nvlist_remove_all(props,
zpool_prop_to_name(ZPOOL_PROP_VERSION));
+ }
#endif /* __FreeBSD__ */
argc -= optind;
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
