Author: avg
Date: Sun Jan 15 21:48:42 2012
New Revision: 230163
URL: http://svn.freebsd.org/changeset/base/230163
Log:
MFC r228266: zfs boot: allow file vdevs to be used in testing (e.g. with
zfsboottest)
Modified:
stable/9/sys/boot/zfs/zfsimpl.c
Directory Properties:
stable/9/sys/ (props changed)
stable/9/sys/amd64/include/xen/ (props changed)
stable/9/sys/boot/ (props changed)
stable/9/sys/boot/i386/efi/ (props changed)
stable/9/sys/boot/ia64/efi/ (props changed)
stable/9/sys/boot/ia64/ski/ (props changed)
stable/9/sys/boot/powerpc/boot1.chrp/ (props changed)
stable/9/sys/boot/powerpc/ofw/ (props changed)
stable/9/sys/cddl/contrib/opensolaris/ (props changed)
stable/9/sys/conf/ (props changed)
stable/9/sys/contrib/dev/acpica/ (props changed)
stable/9/sys/contrib/octeon-sdk/ (props changed)
stable/9/sys/contrib/pf/ (props changed)
stable/9/sys/contrib/x86emu/ (props changed)
Modified: stable/9/sys/boot/zfs/zfsimpl.c
==============================================================================
--- stable/9/sys/boot/zfs/zfsimpl.c Sun Jan 15 21:43:24 2012
(r230162)
+++ stable/9/sys/boot/zfs/zfsimpl.c Sun Jan 15 21:48:42 2012
(r230163)
@@ -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");
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
