d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix typesetting of Errata #4

Browse Source 
Reviewed-by: Olaf Faaland <faaland1@llnl.gov>
Reviewed-by: Richard Laager <rlaager@wiktel.com>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Justin Scholz <git@justinscholz.de>
Closes #8712 
Closes #8721
This commit is contained in:
JMoVS 2019-05-09 01:04:45 +02:00 committed by Brian Behlendorf
parent 3b770842d5
commit e2dddb7e58
1 changed files with 22 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
cmd/zpool/zpool_main.c
View File

@ -2570,16 +2570,16 @@ show_import(nvlist_t *config)
(void) printf(gettext(" action: Existing " (void) printf(gettext(" action: Existing "
"encrypted snapshots and bookmarks contain " "encrypted snapshots and bookmarks contain "
"an on-disk\n\tincompatibility. This may " "an on-disk\n\tincompatibility. This may "
"cause on-disk corruption if they are used " "cause on-disk corruption if they are used"
"with\n\t'zfs recv'. To correct the issue, " "\n\twith 'zfs recv'. To correct the "
"enable the bookmark_v2 feature. No " "issue, enable the bookmark_v2 feature.\n\t"
"additional\n\taction is needed if there " "No additional action is needed if there "
"are no encrypted snapshots or bookmarks. " "are no encrypted snapshots or\n\t"
"If preserving\n\tthe encrypted snapshots " "bookmarks. If preserving the encrypted "
"and bookmarks is required, use a non-raw " "snapshots and bookmarks is\n\trequired, "
"send to backup\n\tand restore them. " "use a non-raw send to backup and restore "
"Alternately, they may be removed to " "them. Alternately,\n\tthey may be removed"
"resolve the\n\tincompatibility.\n")); " to resolve the incompatibility.\n"));
break; break;
default: default:
/* /*
@ -7636,19 +7636,18 @@ status_callback(zpool_handle_t *zhp, void *data)
break; break;
case ZPOOL_ERRATA_ZOL_8308_ENCRYPTION: case ZPOOL_ERRATA_ZOL_8308_ENCRYPTION:
(void) printf(gettext("Existing encrypted snapshots " (void) printf(gettext("\tExisting encrypted snapshots "
"and bookmarks contain an on-disk " "and bookmarks contain an on-disk\n\tincompat"
"incompatibility.\n\tThis may cause on-disk " "ibility. This may cause on-disk corruption if "
"corruption if they are used with 'zfs recv'.")); "they are used\n\twith 'zfs recv'.\n"));
(void) printf(gettext(" action: To correct the issue, " (void) printf(gettext("action: To correct the issue, "
"enable the bookmark_v2 feature. No " "enable the bookmark_v2 feature. No additional\n\t"
"additional\n\taction is needed if there " "action is needed if there are no encrypted "
"are no encrypted snapshots or bookmarks. " "snapshots or bookmarks.\n\tIf preserving the "
"If preserving\n\tthe encrypted snapshots " "encrypted snapshots and bookmarks is required, "
"and bookmarks is required, use a non-raw " "use\n\ta non-raw send to backup and restore them. "
"send to backup\n\tand restore them. " "Alternately, they may be\n\tremoved to resolve "
"Alternately, they may be removed to " "the incompatibility.\n"));
"resolve the\n\tincompatibility.\n"));
break; break;
default: default: