svn commit: r228266 - head/sys/boot/zfs

[Andriy Gapon]

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");