From owner-svn-src-all@FreeBSD.ORG  Thu Apr  4 17:10:37 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 1D3A54DA;
 Thu,  4 Apr 2013 17:10:37 +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 0E0D01C2;
 Thu,  4 Apr 2013 17:10:37 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r34HAahg031183;
 Thu, 4 Apr 2013 17:10:36 GMT (envelope-from delphij@svn.freebsd.org)
Received: (from delphij@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r34HAa9w031182;
 Thu, 4 Apr 2013 17:10:36 GMT (envelope-from delphij@svn.freebsd.org)
Message-Id: <201304041710.r34HAa9w031182@svn.freebsd.org>
From: Xin LI <delphij@FreeBSD.org>
Date: Thu, 4 Apr 2013 17:10:36 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
Subject: svn commit: r249100 - stable/8/cddl/contrib/opensolaris/cmd/zpool
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 04 Apr 2013 17:10:37 -0000

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;