svn commit: r249116 - releng/8.4/cddl/contrib/opensolaris/cmd/zpool

[Xin LI]

Author: delphij
Date: Thu Apr  4 23:36:14 2013
New Revision: 249116
URL: http://svnweb.freebsd.org/changeset/base/249116

Log:
  MFS r249068 [1],249100,249114 [2]:
  
  Limit the creation version to 28 by default to avoid surprises when
  user "upgrade" to 9.1-RELEASE, which predates the merge of feature
  flags support to stable/9 (r243674) and is the latest stable/9 release
  at this time.
  
  Users who want the new features can still do "zpool upgrade" after pool
  creation, or by explicitly specifying feature flags and/or disabling
  all feature flags at creation time.
  
  Reviewed by:	mm [1], Matthew Ahrens [2]
  Approved by:	re (jpaetzel)

Modified:
  releng/8.4/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
Directory Properties:
  releng/8.4/cddl/contrib/opensolaris/   (props changed)

Modified: releng/8.4/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
==============================================================================
--- releng/8.4/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c	Thu Apr  4 23:19:51 2013	(r249115)
+++ releng/8.4/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c	Thu Apr  4 23:36:14 2013	(r249116)
@@ -856,6 +856,16 @@ zpool_do_create(int argc, char **argv)
 		}
 	}
 
+#ifdef __FreeBSD__
+	/* Compatiblity with FreeBSD 9.0 and 9.1: Use version 28 if unspecified */
+	if (enable_all_pool_feat && !prop_list_contains_feature(props)) {
+		if (add_prop_list(zpool_prop_to_name(
+		    ZPOOL_PROP_VERSION), "28", &props, B_TRUE))
+			goto errout;
+		enable_all_pool_feat = B_FALSE;
+	}
+#endif /* __FreeBSD__ */
+
 	argc -= optind;
 	argv += optind;