diff options
| author | Luca Boccassi <luca.boccassi@microsoft.com> | 2021-08-31 09:06:33 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-31 09:06:33 +0100 |
| commit | 1f08acf406a3b9e1b713efbbec137997a877253c (patch) | |
| tree | 9c88f32470c45be9e079751bd70ae25750fbedc5 /src/test | |
| parent | e658a3732629756245bc9aeaabb813fa64bc85c6 (diff) | |
| parent | a36429971ad46af5b29d3dafba1adc596e5aaa60 (diff) | |
| download | systemd-1f08acf406a3b9e1b713efbbec137997a877253c.tar.gz | |
Merge pull request #20257 from bluca/seqno
Use new diskseq block device property
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/test-loop-block.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/test/test-loop-block.c b/src/test/test-loop-block.c index 57f3279b67..1642f82e40 100644 --- a/src/test/test-loop-block.c +++ b/src/test/test-loop-block.c @@ -51,7 +51,7 @@ static void* thread_func(void *ptr) { log_notice("Acquired loop device %s, will mount on %s", loop->node, mounted); - r = dissect_image(loop->fd, NULL, NULL, loop->uevent_seqnum_not_before, loop->timestamp_not_before, DISSECT_IMAGE_READ_ONLY, &dissected); + r = dissect_image(loop->fd, NULL, NULL, loop->diskseq, loop->uevent_seqnum_not_before, loop->timestamp_not_before, DISSECT_IMAGE_READ_ONLY, &dissected); if (r < 0) log_error_errno(r, "Failed dissect loopback device %s: %m", loop->node); assert_se(r >= 0); @@ -188,7 +188,7 @@ int main(int argc, char *argv[]) { sfdisk = NULL; assert_se(loop_device_make(fd, O_RDWR, 0, UINT64_MAX, LO_FLAGS_PARTSCAN, &loop) >= 0); - assert_se(dissect_image(loop->fd, NULL, NULL, loop->uevent_seqnum_not_before, loop->timestamp_not_before, 0, &dissected) >= 0); + assert_se(dissect_image(loop->fd, NULL, NULL, loop->diskseq, loop->uevent_seqnum_not_before, loop->timestamp_not_before, 0, &dissected) >= 0); assert_se(dissected->partitions[PARTITION_ESP].found); assert_se(dissected->partitions[PARTITION_ESP].node); @@ -212,7 +212,7 @@ int main(int argc, char *argv[]) { assert_se(make_filesystem(dissected->partitions[PARTITION_HOME].node, "ext4", "home", id, true) >= 0); dissected = dissected_image_unref(dissected); - assert_se(dissect_image(loop->fd, NULL, NULL, loop->uevent_seqnum_not_before, loop->timestamp_not_before, 0, &dissected) >= 0); + assert_se(dissect_image(loop->fd, NULL, NULL, loop->diskseq, loop->uevent_seqnum_not_before, loop->timestamp_not_before, 0, &dissected) >= 0); assert_se(mkdtemp_malloc(NULL, &mounted) >= 0); |