Clearer wording on Errata #4

Users of existing pools, especially pools with top-level encrypted 
datasets, could run into trouble trying to work around Errata #4. 
Clarify that removing encrypted snapshots and bookmarks is enough
to clear the errata.

Reviewed-by: George Melikov <[email protected]>
Reviewed-by: Richard Laager <[email protected]>
Reviewed-by: Brian Behlendorf <[email protected]>
Reviewed-by: Tom Caputi <[email protected]>
Signed-off-by: Justin Scholz <[email protected]>
Closes #8682 
Closes #8683 

1 files changed, 26 insertions, 21 deletions

diff --git a/cmd/zpool/zpool_main.c b/cmd/zpool/zpool_main.c
index 32c94d7db..34b9272a3 100644
--- a/cmd/zpool/zpool_main.c
+++ b/cmd/zpool/zpool_main.c
@@ -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:
 				/*
@@ -7634,16 +7636,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: