Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Clearer wording on Errata #4 for non-destructive remedy #8683

Merged
merged 3 commits into from
May 2, 2019
Merged

Clearer wording on Errata #4 for non-destructive remedy #8683

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cbb51ab
Clearer wording on Errata #4
JMoVS Apr 29, 2019
0b19f97
change to include bookmarks in the language
JMoVS May 1, 2019
129e9ee
fix wording, new wording, and more commas
JMoVS May 1, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 26 additions & 21 deletions cmd/zpool/zpool_main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2567,17 +2567,19 @@ show_import(nvlist_t *config)
break;

case ZPOOL_ERRATA_ZOL_8308_ENCRYPTION:
(void) printf(gettext(" action: Any existing "
"encrypted datasets contain an on-disk "
"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"));
(void) printf(gettext(" action: Existing "
"encrypted snapshots and bookmarks contain "
"an on-disk\n\tincompatibility. This may "
"cause on-disk corruption if they are used "
"with\n\t'zfs recv'. To correct the issue, "
"enable the bookmark_v2 feature. No "
"additional\n\taction is needed if there "
"are no encrypted snapshots or bookmarks. "
"If preserving\n\tthe encrypted snapshots "
"and bookmarks is required, use a non-raw "
"send to backup\n\tand restore them. "
"Alternately, they may be removed to "
"resolve the\n\tincompatibility.\n"));
break;
default:
/*
Expand Down Expand Up @@ -7633,16 +7635,19 @@ status_callback(zpool_handle_t *zhp, void *data)
break;

case ZPOOL_ERRATA_ZOL_8308_ENCRYPTION:
(void) printf(gettext("\tExisting encrypted datasets "
"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 "
"datasets, simply enable the bookmark_v2 "
"feature.\n"));
(void) printf(gettext("Existing encrypted snapshots "
"and bookmarks contain an on-disk "
"incompatibility.\n\tThis may cause on-disk "
"corruption if they are used with 'zfs recv'."));
(void) printf(gettext(" action: To correct the issue, "
"enable the bookmark_v2 feature. No "
"additional\n\taction is needed if there "
"are no encrypted snapshots or bookmarks. "
"If preserving\n\tthe encrypted snapshots "
"and bookmarks is required, use a non-raw "
"send to backup\n\tand restore them. "
"Alternately, they may be removed to "
"resolve the\n\tincompatibility.\n"));
break;

default:
Expand Down