diff options
| author | Lennart Poettering <lennart@poettering.net> | 2021-04-20 16:19:27 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2021-04-20 17:20:38 +0200 |
| commit | 4a62257d6837fe33c7fb93a417156b94a6c8c83a (patch) | |
| tree | c2739f41d84b6fea7cf3b4df3c64106e7978abd3 /src/test/test-loop-block.c | |
| parent | 8ede1e86b2cfdbe7bb1e1913a08e068a82d4532c (diff) | |
| download | systemd-4a62257d6837fe33c7fb93a417156b94a6c8c83a.tar.gz | |
dissect: ignore udev database entries from before the loopback attachment
This tries to shorten the race of device reuse a bit more: let's ignore
udev database entries that are older than the time where we started to
use a loopback device.
This doesn't fix the whole loopback device raciness mess, but it makes
the race window a bit shorter.
Diffstat (limited to 'src/test/test-loop-block.c')
| -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 cfa999eff7..ba44b5f3f9 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, DISSECT_IMAGE_READ_ONLY, &dissected); + r = dissect_image(loop->fd, NULL, NULL, 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, 0, &dissected) >= 0); + assert_se(dissect_image(loop->fd, NULL, NULL, 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, 0, &dissected) >= 0); + assert_se(dissect_image(loop->fd, NULL, NULL, loop->uevent_seqnum_not_before, loop->timestamp_not_before, 0, &dissected) >= 0); assert_se(mkdtemp_malloc(NULL, &mounted) >= 0); |