diff options
| author | avg <avg@FreeBSD.org> | 2011-12-04 21:29:56 +0000 |
|---|---|---|
| committer | avg <avg@FreeBSD.org> | 2011-12-04 21:29:56 +0000 |
| commit | 2d5c2df3426908fe17f500e524ce2cb57f3295e5 (patch) | |
| tree | 86626f0cd6795cd5473c719c941bc1538b7e252c /sys/boot | |
| parent | c3db2f30bbfb50c8a85f5c8772f5fb2f25446647 (diff) | |
| download | FreeBSD-src-2d5c2df3426908fe17f500e524ce2cb57f3295e5.zip FreeBSD-src-2d5c2df3426908fe17f500e524ce2cb57f3295e5.tar.gz | |
zfs boot: allow file vdevs to be used in testing (e.g. with zfsboottest)
MFC after: 1 week
Diffstat (limited to 'sys/boot')
| -rw-r--r-- | sys/boot/zfs/zfsimpl.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sys/boot/zfs/zfsimpl.c b/sys/boot/zfs/zfsimpl.c index c97c2de..55c6e28 100644 --- a/sys/boot/zfs/zfsimpl.c +++ b/sys/boot/zfs/zfsimpl.c @@ -458,6 +458,9 @@ vdev_init_from_nvlist(const unsigned char *nvlist, vdev_t *pvdev, 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"); |
