summaryrefslogtreecommitdiff
path: root/rescue
diff options
context:
space:
mode:
authormmacy <mmacy@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>2020-08-25 02:21:27 +0000
committermmacy <mmacy@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>2020-08-25 02:21:27 +0000
commita9c1ca57ed26a68e9d977711a6d326eff854a033 (patch)
tree2ebf833af6b1953d4a683e2da830fe87bf3435e1 /rescue
parentdbe7569448e2f650fbc37e99a853c5d2f4f46ff0 (diff)
downloadfreebsd-a9c1ca57ed26a68e9d977711a6d326eff854a033.tar.gz
freebsd-a9c1ca57ed26a68e9d977711a6d326eff854a033.tar.bz2
Merge OpenZFS support in to HEAD.
The primary benefit is maintaining a completely shared code base with the community allowing FreeBSD to receive new features sooner and with less effort. I would advise against doing 'zpool upgrade' or creating indispensable pools using new features until this change has had a month+ to soak. Work on merging FreeBSD support in to what was at the time "ZFS on Linux" began in August 2018. I first publicly proposed transitioning FreeBSD to (new) OpenZFS on December 18th, 2018. FreeBSD support in OpenZFS was finally completed in December 2019. A CFT for downstreaming OpenZFS support in to FreeBSD was first issued on July 8th. All issues that were reported have been addressed or, for a couple of less critical matters there are pull requests in progress with OpenZFS. iXsystems has tested and dogfooded extensively internally. The TrueNAS 12 release is based on OpenZFS with some additional features that have not yet made it upstream. Improvements include: project quotas, encrypted datasets, allocation classes, vectorized raidz, vectorized checksums, various command line improvements, zstd compression. Thanks to those who have helped along the way: Ryan Moeller, Allan Jude, Zack Welch, and many others. Sponsored by: iXsystems, Inc. Differential Revision: https://reviews.freebsd.org/D25872 git-svn-id: http://svn.freebsd.org/base/head@364746 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
Diffstat (limited to 'rescue')
-rw-r--r--rescue/rescue/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/rescue/rescue/Makefile b/rescue/rescue/Makefile
index 66aa7f188ec..bda45c7d288 100644
--- a/rescue/rescue/Makefile
+++ b/rescue/rescue/Makefile
@@ -129,7 +129,7 @@ CRUNCH_PROGS_usr.sbin+= zdb
CRUNCH_LIBS+= -l80211 -lalias -lcam -lncursesw -ldevstat -lipsec -llzma
.if ${MK_ZFS} != "no"
CRUNCH_LIBS+= -lavl -lzpool -lzfs_core -lzfs -lnvpair -lpthread -luutil -lumem
-CRUNCH_LIBS+= -lbe
+CRUNCH_LIBS+= -lbe -lzutil -ltpool -lspl -licp_rescue
.else
# liblzma needs pthread
CRUNCH_LIBS+= -lpthread