From 67ab133c97ff176d12c2d312ed2e30eaef762fd0 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Thu, 1 Oct 2015 16:37:02 -0700 Subject: [PATCH] Add 'zhack feature enable' force option Add a force option to allow zhack to add features which are part of the known set of supported features. By default this is disabled. --- cmd/zhack/zhack.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/cmd/zhack/zhack.c b/cmd/zhack/zhack.c index 6c57be444036..61fd7424b64f 100644 --- a/cmd/zhack/zhack.c +++ b/cmd/zhack/zhack.c @@ -359,8 +359,10 @@ zhack_do_feature_enable(int argc, char **argv) zhack_spa_open(target, B_FALSE, FTAG, &spa); mos = spa->spa_meta_objset; - if (zfeature_is_supported(feature.fi_guid)) - fatal(spa, FTAG, "'%s' is a real feature, will not enable"); + if (zfeature_is_supported(feature.fi_guid) && (g_force == B_FALSE)) + fatal(spa, FTAG, + "'%s' is a real feature, will not enable\n" + "provide the -f option to force override", feature.fi_guid); if (0 == zap_contains(mos, spa->spa_feat_desc_obj, feature.fi_guid)) fatal(spa, FTAG, "feature already enabled: %s", feature.fi_guid);