Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 4 Dec 2011 21:29:56 +0000 (UTC)
From:      Andriy Gapon <avg@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r228266 - head/sys/boot/zfs
Message-ID:  <201112042129.pB4LTumU003817@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: avg
Date: Sun Dec  4 21:29:56 2011
New Revision: 228266
URL: http://svn.freebsd.org/changeset/base/228266

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

Modified:
  head/sys/boot/zfs/zfsimpl.c

Modified: head/sys/boot/zfs/zfsimpl.c
==============================================================================
--- head/sys/boot/zfs/zfsimpl.c	Sun Dec  4 21:27:41 2011	(r228265)
+++ head/sys/boot/zfs/zfsimpl.c	Sun Dec  4 21:29:56 2011	(r228266)
@@ -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?201112042129.pB4LTumU003817>