aboutsummaryrefslogtreecommitdiff
path: root/cddl/usr.sbin/Makefile
diff options
context:
space:
mode:
authorMartin Matuska <mm@FreeBSD.org>2012-06-11 11:35:22 +0000
committerMartin Matuska <mm@FreeBSD.org>2012-06-11 11:35:22 +0000
commit2d9cf57e18654edda53bcb460ca66641ba69ed75 (patch)
treea0efb9ad759cc8c8f8ec6f2cbabe6b3305a334e9 /cddl/usr.sbin/Makefile
parent7561cb5c8b386140f01f0d6b0560fee7f5127dd6 (diff)
downloadsrc-2d9cf57e18654edda53bcb460ca66641ba69ed75.tar.gz
src-2d9cf57e18654edda53bcb460ca66641ba69ed75.zip
Introduce "feature flags" for ZFS pools (bump SPA version to 5000).
Add first feature "com.delphix:async_destroy" (asynchronous destroy of ZFS datasets). Implement features support in ZFS boot code. Illumos revisions merged: 13700:2889e2596bd6 13701:1949b688d5fb 2619 asynchronous destruction of ZFS file systems 2747 SPA versioning with zfs feature flags References: https://www.illumos.org/issues/2619 https://www.illumos.org/issues/2747 Obtained from: illumos (issue #2619, #2747) MFC after: 1 month
Notes
Notes: svn path=/head/; revision=236884
Diffstat (limited to 'cddl/usr.sbin/Makefile')
-rw-r--r--cddl/usr.sbin/Makefile4
1 files changed, 3 insertions, 1 deletions
diff --git a/cddl/usr.sbin/Makefile b/cddl/usr.sbin/Makefile
index a84715b69981..42d124f90046 100644
--- a/cddl/usr.sbin/Makefile
+++ b/cddl/usr.sbin/Makefile
@@ -5,11 +5,13 @@
SUBDIR= ${_dtrace} \
${_dtruss} \
${_lockstat} \
- ${_zdb}
+ ${_zdb} \
+ ${_zhack}
.if ${MK_ZFS} != "no"
.if ${MK_LIBTHR} != "no"
_zdb= zdb
+_zhack= zhack
.endif
.endif