From 06ea920c54266e1d8abdc1d92e7f4fe110b7f728 Mon Sep 17 00:00:00 2001 From: Justin Scholz Date: Mon, 29 Apr 2019 10:09:14 +0200 Subject: [PATCH] Clearer wording on Errata #4 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Errata #4 doesn’t mention a non-destructive way to clear it. This commits fixes #8682. Signed-off-by: Justin Scholz --- cmd/zpool/zpool_main.c | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/cmd/zpool/zpool_main.c b/cmd/zpool/zpool_main.c index c167324ce820..99fe7c839341 100644 --- a/cmd/zpool/zpool_main.c +++ b/cmd/zpool/zpool_main.c @@ -2572,12 +2572,15 @@ show_import(nvlist_t *config) "incompatibility\n\twhich may cause " "on-disk corruption with 'zfs recv' and " "which needs\n\tto be corrected. Enable " - "the bookmark_v2 feature, backup " - "these datasets\n\tto new encrypted " - "datasets, and destroy the old ones. " - "If this pool does\n\tnot contain any " - "encrypted datasets, simply enable the " - "bookmark_v2\n\tfeature.\n")); + "the bookmark_v2 feature. Destroy all " + "snapshots (on encrypted datasets) that " + "were created before enabling bookmark_v2. " + "If preserving those snapshots is " + "required, copy them to new encrypted " + "datasets with zfs send. If this pool " + "does\n\tnot contain any encrypted " + "datasets, simply enable the bookmark_v2 " + "\n\tfeature.\n")); break; default: /* @@ -7637,12 +7640,15 @@ status_callback(zpool_handle_t *zhp, void *data) "contain an on-disk incompatibility\n\twhich " "needs to be corrected.\n")); (void) printf(gettext("action: To correct the issue " - "enable the bookmark_v2 feature, backup\n\tany " - "existing encrypted datasets to new encrypted " - "datasets,\n\tand destroy the old ones. If this " - "pool does not contain any\n\tencrypted " + "enable the bookmark_v2 feature. Destroy all " + "snapshots (on encrypted datasets) that " + "were created before enabling bookmark_v2. " + "If preserving those snapshots is " + "required, copy them to new encrypted " + "datasets with zfs send. If this pool " + "does\n\tnot contain any encrypted " "datasets, simply enable the bookmark_v2 " - "feature.\n")); + "\n\tfeature.\n")); break; default: