Skip to content

Commit

Permalink
Clearer wording on Errata openzfs#4
Browse files Browse the repository at this point in the history
Errata openzfs#4 doesn’t mention a non-destructive way to clear it. This commits fixes openzfs#8682
  • Loading branch information
JMoVS committed Apr 29, 2019
1 parent b43a27f commit 21a4417
Showing 1 changed file with 12 additions and 8 deletions.
20 changes: 12 additions & 8 deletions cmd/zpool/zpool_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -2574,10 +2574,12 @@ show_import(nvlist_t *config)
"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"));
"datasets, and destroy the old ones or "
"create new snapshots and destroy all "
"snapshots that were created before enabling "
"bookmark_v2. If this pool does\n\tnot "
"contain any encrypted datasets, simply enable "
"the bookmark_v2\n\tfeature.\n"));
break;
default:
/*
Expand Down Expand Up @@ -7639,10 +7641,12 @@ status_callback(zpool_handle_t *zhp, void *data)
(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 "
"datasets, simply enable the bookmark_v2 "
"feature.\n"));
"datasets,\n\tand destroy the old ones or create "
"new snapshots and destroy all snapshots that"
"were created before enabling bookmark_v2. "
"If this pool does\n\tnot contain any encrypted "
"datasets, simply enable the "
"bookmark_v2\n\tfeature.\n"));
break;

default:
Expand Down

0 comments on commit 21a4417

Please sign in to comment.