Skip to content

Commit

Permalink
Fix typesetting of Errata #4
Browse files Browse the repository at this point in the history
Signed-off-by: Justin Scholz <git@justinscholz.de>
Issue openzfs#8712
  • Loading branch information
JMoVS authored and behlendorf committed May 7, 2019
1 parent 9c53e51 commit b509b15
Showing 1 changed file with 22 additions and 23 deletions.
45 changes: 22 additions & 23 deletions cmd/zpool/zpool_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -2570,16 +2570,16 @@ show_import(nvlist_t *config)
(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"));
"cause on-disk corruption if they are used"
"\n\twith 'zfs recv'. To correct the "
"issue, enable the bookmark_v2 feature.\n\t"
"No additional action is needed if there "
"are no encrypted snapshots or\n\t"
"bookmarks. If preserving the encrypted "
"snapshots and bookmarks is\n\trequired, "
"use a non-raw send to backup and restore "
"them. Alternately,\n\tthey may be removed"
" to resolve the incompatibility.\n"));
break;
default:
/*
Expand Down Expand Up @@ -7636,19 +7636,18 @@ status_callback(zpool_handle_t *zhp, void *data)
break;

case ZPOOL_ERRATA_ZOL_8308_ENCRYPTION:
(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"));
(void) printf(gettext("\tExisting encrypted snapshots "
"and bookmarks contain an on-disk\n\tincompat"

This comment has been minimized.

Copy link
@rlaager

rlaager May 8, 2019

This is wrapped such that it breaks the word "incompatibility". While that works fine, this is the only place in these strings where that is done. Is that desirable?

This comment has been minimized.

Copy link
@behlendorf

behlendorf May 8, 2019

Owner

I don't think we should make a habit of it, but in this case I don't think it's a problem.

"ibility. This may cause on-disk corruption if "
"they are used\n\twith 'zfs recv'.\n"));
(void) printf(gettext("action: To correct the issue, "
"enable the bookmark_v2 feature. No additional\n\t"
"action is needed if there are no encrypted "
"snapshots or bookmarks.\n\tIf preserving the "
"encrypted snapshots and bookmarks is required, "
"use\n\ta non-raw send to backup and restore them. "
"Alternately, they may be\n\tremoved to resolve "
"the incompatibility.\n"));
break;

default:
Expand Down

0 comments on commit b509b15

Please sign in to comment.