eessppeelllloo/cryptsetup
1
0
Fork 0
mirror of https://gitlab.com/cryptsetup/cryptsetup.git synced 2025-12-13 03:40:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add parameter for progress update without in separate lines

Browse Source
This commit is contained in:
Milan Broz
2017-10-19 14:42:14 +02:00
committed by Ondrej Kozina
parent a96d999087
commit c0a860c1e9
2 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
man/cryptsetup-reencrypt.8
View File

@@ -38,7 +38,7 @@ To start (or continue) re-encryption for <device> use:
\-\-device-size, \-\-hash, \-\-iter-time, \-\-use-random | \-\-use-urandom, \-\-device-size, \-\-hash, \-\-iter-time, \-\-use-random | \-\-use-urandom,
\-\-keep-key, \-\-key-size, \-\-key-file, \-\-key-slot, \-\-keyfile-offset, \-\-keep-key, \-\-key-size, \-\-key-file, \-\-key-slot, \-\-keyfile-offset,
\-\-keyfile-size, \-\-tries, \-\-use-directio, \-\-use-fsync, \-\-verbose, \-\-write-log, \-\-keyfile-size, \-\-tries, \-\-use-directio, \-\-use-fsync, \-\-verbose, \-\-write-log,
\-\-uuid] \-\-uuid, \-\-progress-frequency]
To encrypt data on (not yet encrypted) device, use \fI\-\-new\fR with combination To encrypt data on (not yet encrypted) device, use \fI\-\-new\fR with combination
with \fI\-\-reduce-device-size\fR. with \fI\-\-reduce-device-size\fR.
@@ -190,6 +190,9 @@ of the interrupted decryption process.
.B "\-\-batch-mode, \-q" .B "\-\-batch-mode, \-q"
Suppresses all warnings and reencryption progress output. Suppresses all warnings and reencryption progress output.
.TP .TP
.B "\-\-progress-frequency <seconds>"
Print separate line every <seconds> with reencryption progress.
.TP
.B "\-\-version" .B "\-\-version"
Show the program version. Show the program version.
.SH RETURN CODES .SH RETURN CODES

20
src/cryptsetup_reencrypt.c
View File

@@ -51,6 +51,7 @@ static int opt_key_size = 0;
static int opt_new = 0; static int opt_new = 0;
static int opt_keep_key = 0; static int opt_keep_key = 0;
static int opt_decrypt = 0; static int opt_decrypt = 0;
static int opt_progress_frequency = 0;
static const char *opt_reduce_size_str = NULL; static const char *opt_reduce_size_str = NULL;
static uint64_t opt_reduce_size = 0; static uint64_t opt_reduce_size = 0;
@@ -665,10 +666,18 @@ static void print_progress(struct reenc_ctx *rc, uint64_t bytes, int final)
{ {
unsigned long long mbytes, eta; unsigned long long mbytes, eta;
struct timeval now_time; struct timeval now_time;
double tdiff, mib; double tdiff, mib, frequency;
char *eol = "";
gettimeofday(&now_time, NULL); gettimeofday(&now_time, NULL);
if (!final && time_diff(rc->end_time, now_time) < 0.5) if (opt_progress_frequency)
frequency = (double)opt_progress_frequency;
else
frequency = 0.5;
if (final || opt_progress_frequency)
eol = "\n";
if (!final && time_diff(rc->end_time, now_time) < frequency)
return; return;
rc->end_time = now_time; rc->end_time = now_time;
@@ -689,12 +698,12 @@ static void print_progress(struct reenc_ctx *rc, uint64_t bytes, int final)
eta = (unsigned long long)(rc->device_size / 1024 / 1024 / mib - tdiff); eta = (unsigned long long)(rc->device_size / 1024 / 1024 / mib - tdiff);
/* vt100 code clear line */ /* vt100 code clear line */
log_err("\33[2K\r"); if (!opt_progress_frequency)
log_err("\33[2K\r");
log_err(_("Progress: %5.1f%%, ETA %02llu:%02llu, " log_err(_("Progress: %5.1f%%, ETA %02llu:%02llu, "
"%4llu MiB written, speed %5.1f MiB/s%s"), "%4llu MiB written, speed %5.1f MiB/s%s"),
(double)bytes / rc->device_size * 100, (double)bytes / rc->device_size * 100,
eta / 60, eta % 60, mbytes, mib, eta / 60, eta % 60, mbytes, mib, eol);
final ? "\n" :"");
} }
static ssize_t read_buf(int fd, void *buf, size_t count) static ssize_t read_buf(int fd, void *buf, size_t count)
@@ -1316,6 +1325,7 @@ int main(int argc, const char **argv)
{ "key-file", 'd', POPT_ARG_STRING, &opt_key_file, 0, N_("Read the key from a file."), NULL }, { "key-file", 'd', POPT_ARG_STRING, &opt_key_file, 0, N_("Read the key from a file."), NULL },
{ "iter-time", 'i', POPT_ARG_INT, &opt_iteration_time, 0, N_("PBKDF2 iteration time for LUKS (in ms)"), N_("msecs") }, { "iter-time", 'i', POPT_ARG_INT, &opt_iteration_time, 0, N_("PBKDF2 iteration time for LUKS (in ms)"), N_("msecs") },
{ "batch-mode", 'q', POPT_ARG_NONE, &opt_batch_mode, 0, N_("Do not ask for confirmation"), NULL }, { "batch-mode", 'q', POPT_ARG_NONE, &opt_batch_mode, 0, N_("Do not ask for confirmation"), NULL },
{ "progress-frequency",'\0', POPT_ARG_INT, &opt_progress_frequency, 0, N_("Progress line update (in seconds)"), N_("secs") },
{ "tries", 'T', POPT_ARG_INT, &opt_tries, 0, N_("How often the input of the passphrase can be retried"), NULL }, { "tries", 'T', POPT_ARG_INT, &opt_tries, 0, N_("How often the input of the passphrase can be retried"), NULL },
{ "use-random", '\0', POPT_ARG_NONE, &opt_random, 0, N_("Use /dev/random for generating volume key."), NULL }, { "use-random", '\0', POPT_ARG_NONE, &opt_random, 0, N_("Use /dev/random for generating volume key."), NULL },
{ "use-urandom", '\0', POPT_ARG_NONE, &opt_urandom, 0, N_("Use /dev/urandom for generating volume key."), NULL }, { "use-urandom", '\0', POPT_ARG_NONE, &opt_urandom, 0, N_("Use /dev/urandom for generating volume key."), NULL },