summaryrefslogtreecommitdiff
path: root/usr/src/pkg
diff options
context:
space:
mode:
authorLOLi <loli10K@users.noreply.github.com>2020-04-28 12:58:22 -0500
committerJason King <jason.king@joyent.com>2020-04-30 12:29:18 -0500
commitf343451914d0efaf2d6fc84d8818a16246b223dc (patch)
treee808ea7e816231e4cccca2011b385f42015ab68f /usr/src/pkg
parent19325e87abbf92e73010df2342fc48019027aee1 (diff)
downloadillumos-joyent-f343451914d0efaf2d6fc84d8818a16246b223dc.tar.gz
12635 Allow for '-o feature@<feature>=disabled' on the command line
Portions contributed by: Turbo Fredriksson <turbo@bayour.com> Portions contributed by: Jason King <jason.king@joyent.com> Reviewed by: Toomas Soome <tsoome@me.com> Reviewed by: Jerry Jelinek <jerry.jelinek@joyent.com> Approved by: Robert Mustacchi <rm@fingolfin.org>
Diffstat (limited to 'usr/src/pkg')
-rw-r--r--usr/src/pkg/manifests/system-test-zfstest.mf3
1 files changed, 3 insertions, 0 deletions
diff --git a/usr/src/pkg/manifests/system-test-zfstest.mf b/usr/src/pkg/manifests/system-test-zfstest.mf
index 6ffc0b4f56..09d431d538 100644
--- a/usr/src/pkg/manifests/system-test-zfstest.mf
+++ b/usr/src/pkg/manifests/system-test-zfstest.mf
@@ -1631,6 +1631,9 @@ file \
path=opt/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_features_004_neg \
mode=0555
file \
+ path=opt/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_features_005_pos \
+ mode=0555
+file \
path=opt/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_tempname \
mode=0555
file \