summaryrefslogtreecommitdiffstats
path: root/sys/boot/userboot/userboot/conf.c
diff options
context:
space:
mode:
authorjhb <jhb@FreeBSD.org>2014-07-20 22:54:03 +0000
committerjhb <jhb@FreeBSD.org>2014-07-20 22:54:03 +0000
commit25b41d088263e9d1574521319b2e37df9842fd2f (patch)
tree04e404b73937ec33991b2d714889ca71f09f1394 /sys/boot/userboot/userboot/conf.c
parent9822066797603d4d23201ae909b4fe3ff8c85fb2 (diff)
downloadFreeBSD-src-25b41d088263e9d1574521319b2e37df9842fd2f.zip
FreeBSD-src-25b41d088263e9d1574521319b2e37df9842fd2f.tar.gz
MFC 262331,262487,262495,262523:
ZFS boot support for bhyveload.
Diffstat (limited to 'sys/boot/userboot/userboot/conf.c')
-rw-r--r--sys/boot/userboot/userboot/conf.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/sys/boot/userboot/userboot/conf.c b/sys/boot/userboot/userboot/conf.c
index 2a98434..5eac87da 100644
--- a/sys/boot/userboot/userboot/conf.c
+++ b/sys/boot/userboot/userboot/conf.c
@@ -38,6 +38,10 @@ __FBSDID("$FreeBSD$");
#include "libuserboot.h"
+#if defined(USERBOOT_ZFS_SUPPORT)
+#include "../zfs/libzfs.h"
+#endif
+
/*
* We could use linker sets for some or all of these, but
* then we would have to control what ended up linked into
@@ -51,6 +55,9 @@ __FBSDID("$FreeBSD$");
struct devsw *devsw[] = {
&host_dev,
&userboot_disk,
+#if defined(USERBOOT_ZFS_SUPPORT)
+ &zfs_dev,
+#endif
NULL
};
@@ -59,6 +66,9 @@ struct fs_ops *file_system[] = {
&ufs_fsops,
&cd9660_fsops,
&gzipfs_fsops,
+#if defined(USERBOOT_ZFS_SUPPORT)
+ &zfs_fsops,
+#endif
NULL
};
OpenPOWER on IntegriCloud