Skip to content

Commit

Permalink
change to include bookmarks in the language
Browse files Browse the repository at this point in the history
Signed-off-by: Justin Scholz <[email protected]>
  • Loading branch information
JMoVS committed May 1, 2019
1 parent cbb51ab commit 0b19f97
Showing 1 changed file with 17 additions and 18 deletions.
35 changes: 17 additions & 18 deletions cmd/zpool/zpool_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -2572,15 +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. Destroy all "
"snapshots (on encrypted datasets) that "
"were created before enabling bookmark_v2. "
"If preserving those snapshots is "
"required, send (non-raw) them to new "
"encrypted datasets. If this pool "
"does\n\tnot contain any encrypted "
"datasets, simply enable the bookmark_v2 "
"\n\tfeature.\n"));
"the bookmark_v2 feature and destroy all "
"snapshots and bookmarks (on encrypted "
"datasets) that were created before "
"enabling bookmark_v2. If preserving "
"those snapshots and bookmarks is required, "
"send (non-raw) them to new encrypted "
"datasets. If this pool does\n\tnot contain "
"any encrypted datasets, simply enable the "
"bookmark_v2 \n\tfeature.\n"));
break;
default:
/*
Expand Down Expand Up @@ -7640,15 +7640,14 @@ 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. Destroy all "
"snapshots (on encrypted datasets) that "
"were created before enabling bookmark_v2. "
"If preserving those snapshots is "
"required, send (non-raw) them to new "
"encrypted datasets. If this pool "
"does\n\tnot contain any encrypted "
"datasets, simply enable the bookmark_v2 "
"\n\tfeature.\n"));
"enable the bookmark_v2 feature and destroy all "
"snapshots and bookmarks (on encrypted datasets) "
"that were created before enabling bookmark_v2. "
"If preserving those snapshots and bookmarks is "
"required, send (non-raw) them to new encrypted "
"datasets. 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 0b19f97

Please sign in to comment.