system/systemd
system/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd synced 2024-10-01 13:55:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

repart: show progress bar when initializing partition via CopyBlocks=

Browse source 
This might take a while, hence make it pretty.
This commit is contained in:
Lennart Poettering 2024-05-24 14:00:21 +02:00
parent 468d09c319
commit add090ea82
1 changed files with 23 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/partition/repart.c
View file

@ -295,6 +295,7 @@ typedef struct Partition {
int copy_blocks_fd; int copy_blocks_fd;
uint64_t copy_blocks_offset; uint64_t copy_blocks_offset;
uint64_t copy_blocks_size; uint64_t copy_blocks_size;
uint64_t copy_blocks_done;
char *format; char *format;
char **copy_files; char **copy_files;
@ -4499,6 +4500,26 @@ static int partition_format_verity_sig(Context *context, Partition *p) {
return 0; return 0;
} }
static int progress_bytes(uint64_t n_bytes, void *userdata) {
Partition *p = ASSERT_PTR(userdata);
_cleanup_free_ char *s = NULL;
p->copy_blocks_done += n_bytes;
if (asprintf(&s, "%s %s %s %s/%s ",
strna(p->copy_blocks_path),
special_glyph(SPECIAL_GLYPH_ARROW_RIGHT),
strna(p->definition_path),
FORMAT_BYTES(p->copy_blocks_done),
FORMAT_BYTES(p->copy_blocks_size)) < 0)
return log_oom();
draw_progress_bar(s,
p->copy_blocks_done >= p->copy_blocks_size ? 100.0 : /* catch division be zero */
100.0 * (double) p->copy_blocks_done / (double) p->copy_blocks_size);
return 0;
}
static int context_copy_blocks(Context *context) { static int context_copy_blocks(Context *context) {
int r; int r;
@ -4555,7 +4576,8 @@ static int context_copy_blocks(Context *context) {
return log_error_errno(errno, "Failed to seek to copy blocks offset in %s: %m", p->copy_blocks_path); return log_error_errno(errno, "Failed to seek to copy blocks offset in %s: %m", p->copy_blocks_path);
} }
r = copy_bytes(p->copy_blocks_fd, partition_target_fd(t), p->copy_blocks_size, COPY_REFLINK); r = copy_bytes_full(p->copy_blocks_fd, partition_target_fd(t), p->copy_blocks_size, COPY_REFLINK, /* ret_remains= */ NULL, /* ret_remains_size= */ NULL, progress_bytes, p);
clear_progress_bar(/* prefix= */ NULL);
if (r < 0) if (r < 0)
return log_error_errno(r, "Failed to copy in data from '%s': %m", p->copy_blocks_path); return log_error_errno(r, "Failed to copy in data from '%s': %m", p->copy_blocks_path);