eessppeelllloo/cryptsetup
1
0
Fork 0
mirror of https://gitlab.com/cryptsetup/cryptsetup.git synced 2025-12-22 08:10:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Rephrase UUID error message forc cryptsetup-reencrypt.

Browse Source
This commit is contained in:
Milan Broz
2016-10-20 14:10:29 +02:00
parent 7f9e33ca1e
commit a3ee8f9cb8
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
man/cryptsetup-reencrypt.8
View File

@@ -183,8 +183,9 @@ but will minimize data loss in the case of system crash.
.TP .TP
.B "\-\-uuid" \fI<uuid>\fR .B "\-\-uuid" \fI<uuid>\fR
Use only while resuming an interrupted decryption process (see \-\-decrypt). Use only while resuming an interrupted decryption process (see \-\-decrypt).
To find out what \fI<uuid>\fR to pass look for temporary files LUKS-<uuid>.[|log|org|new] of the
interrupted decryption process. To find out what \fI<uuid>\fR to pass look for temporary files LUKS-<uuid>.[|log|org|new]
of the interrupted decryption process.
.TP .TP
.B "\-\-batch-mode, \-q" .B "\-\-batch-mode, \-q"
Suppresses all warnings and reencryption progress output. Suppresses all warnings and reencryption progress output.

5
src/cryptsetup_reencrypt.c
View File

@@ -973,7 +973,7 @@ static int initialize_uuid(struct reenc_ctx *rc)
if (!r) if (!r)
rc->device_uuid = strdup(opt_uuid); rc->device_uuid = strdup(opt_uuid);
else else
log_err(_("Passed UUID is invalid.\n")); log_err(_("Provided UUID is invalid.\n"));
return r; return r;
} }
@@ -1175,7 +1175,8 @@ static int initialize_context(struct reenc_ctx *rc, const char *device)
if (!rc->in_progress) { if (!rc->in_progress) {
if (opt_uuid) { if (opt_uuid) {
log_err(_("Cannot use passed UUID unless decryption in progress.\n")); log_err(_("No decryption in progress, provided UUID can "
"be used only to resume suspended decryption process.\n"));
return -EINVAL; return -EINVAL;
} }