Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 15 Jan 2012 21:50:17 +0000 (UTC)
From:      Andriy Gapon <avg@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
Subject:   svn commit: r230164 - stable/8/sys/boot/zfs
Message-ID:  <201201152150.q0FLoHVW001684@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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");



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201201152150.q0FLoHVW001684>