aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllan Jude <allanjude@FreeBSD.org>2020-10-15 15:07:25 +0000
committerAllan Jude <allanjude@FreeBSD.org>2020-10-15 15:07:25 +0000
commita022ca0c824d24f6dd7b7bec3f830a377168f495 (patch)
tree4165eb39a09648d788f0dfbdbec7a799e21e3063
parent5a0826ac57e37ec226ec61c1bfa9d74a28165c89 (diff)
downloadsrc-a022ca0c824d24f6dd7b7bec3f830a377168f495.tar.gz
src-a022ca0c824d24f6dd7b7bec3f830a377168f495.zip
ZFS: whitelist zstd and encryption in the loader
MFC r364787: MFS r366593: Please note that neither zstd nor encryption is supported by the loader at this instant. This change makes it safe to use those features in one's root pool, but not in one's root dataset. Approved by: re (gjb)
Notes
Notes: svn path=/releng/12.2/; revision=366729
-rw-r--r--stand/libsa/zfs/zfsimpl.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/stand/libsa/zfs/zfsimpl.c b/stand/libsa/zfs/zfsimpl.c
index 3809cc273625..2fee84ce4906 100644
--- a/stand/libsa/zfs/zfsimpl.c
+++ b/stand/libsa/zfs/zfsimpl.c
@@ -127,6 +127,8 @@ static const char *features_for_read[] = {
"com.delphix:device_removal",
"com.delphix:obsolete_counts",
"com.intel:allocation_classes",
+ "org.freebsd:zstd_compress",
+ "com.datto:encryption",
NULL
};