From owner-svn-src-releng@FreeBSD.ORG  Thu Apr  4 23:36:15 2013
Return-Path: <owner-svn-src-releng@FreeBSD.ORG>
Delivered-To: svn-src-releng@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 3FB8EF0C;
 Thu,  4 Apr 2013 23:36:15 +0000 (UTC)
 (envelope-from delphij@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 3041C340;
 Thu,  4 Apr 2013 23:36:15 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r34NaEh6045767;
 Thu, 4 Apr 2013 23:36:14 GMT (envelope-from delphij@svn.freebsd.org)
Received: (from delphij@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r34NaEhT045766;
 Thu, 4 Apr 2013 23:36:14 GMT (envelope-from delphij@svn.freebsd.org)
Message-Id: <201304042336.r34NaEhT045766@svn.freebsd.org>
From: Xin LI <delphij@FreeBSD.org>
Date: Thu, 4 Apr 2013 23:36:14 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-releng@freebsd.org
Subject: svn commit: r249116 - releng/8.4/cddl/contrib/opensolaris/cmd/zpool
X-SVN-Group: releng
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-releng@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the release engineering / security commits to
 the src tree <svn-src-releng.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-releng>,
 <mailto:svn-src-releng-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-releng>
List-Post: <mailto:svn-src-releng@freebsd.org>
List-Help: <mailto:svn-src-releng-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-releng>,
 <mailto:svn-src-releng-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 04 Apr 2013 23:36:15 -0000

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;