aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Macy <mmacy@FreeBSD.org>2020-08-25 23:26:52 +0000
committerMatt Macy <mmacy@FreeBSD.org>2020-08-25 23:26:52 +0000
commit3e1470776bf574e138472f579900e2002afc1dfd (patch)
tree141d9ad21e4805c6fffcddbf947c3894e24b241a
parent74f5530d7a78d3be0055535e95bca4d520a01328 (diff)
downloadsrc-3e1470776bf574e138472f579900e2002afc1dfd.tar.gz
src-3e1470776bf574e138472f579900e2002afc1dfd.zip
ZFS: whitelist zstd and encryption in the loader
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.
Notes
Notes: svn path=/head/; revision=364787
-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 152c0459c2be..39a98b557aed 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
};