From owner-svn-src-stable@FreeBSD.ORG  Sun Jan 15 21:50:18 2012
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 31E491065670;
	Sun, 15 Jan 2012 21:50:18 +0000 (UTC) (envelope-from avg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 1BD358FC08;
	Sun, 15 Jan 2012 21:50:18 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q0FLoIvI001686;
	Sun, 15 Jan 2012 21:50:18 GMT (envelope-from avg@svn.freebsd.org)
Received: (from avg@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q0FLoHVW001684;
	Sun, 15 Jan 2012 21:50:18 GMT (envelope-from avg@svn.freebsd.org)
Message-Id: <201201152150.q0FLoHVW001684@svn.freebsd.org>
From: Andriy Gapon <avg@FreeBSD.org>
Date: Sun, 15 Jan 2012 21:50:17 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r230164 - stable/8/sys/boot/zfs
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 15 Jan 2012 21:50:18 -0000

Author: avg
Date: Sun Jan 15 21:50:17 2012
New Revision: 230164
URL: http://svn.freebsd.org/changeset/base/230164

Log:
  MFC r228266: zfs boot: allow file vdevs to be used in testing (e.g. with zfsboottest)

Modified:
  stable/8/sys/boot/zfs/zfsimpl.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)

Modified: stable/8/sys/boot/zfs/zfsimpl.c
==============================================================================
--- stable/8/sys/boot/zfs/zfsimpl.c	Sun Jan 15 21:48:42 2012	(r230163)
+++ stable/8/sys/boot/zfs/zfsimpl.c	Sun Jan 15 21:50:17 2012	(r230164)
@@ -458,6 +458,9 @@ vdev_init_from_nvlist(const unsigned cha
 
 	if (strcmp(type, VDEV_TYPE_MIRROR)
 	    && strcmp(type, VDEV_TYPE_DISK)
+#ifdef ZFS_TEST
+	    && strcmp(type, VDEV_TYPE_FILE)
+#endif
 	    && strcmp(type, VDEV_TYPE_RAIDZ)
 	    && strcmp(type, VDEV_TYPE_REPLACING)) {
 		printf("ZFS: can only boot from disk, mirror, raidz1, raidz2 and raidz3 vdevs\n");