picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

dissect-image: wait for the root to appear

Browse source 
dissect-image would wait for the root device and paritions to appear. But if we
had an image with no partitions, we'd not wait at all. If the kernel or udev
were slow in creating device nodes or symlinks, subsequent mount attempt might
fail if nspawn won the race.

Calling wait_for_partitions_to_appear() in case of no partitions means that we
verify that the kernel agrees that there are no partitions. We verify that the
kernel sees the same number of partitions as blkid, so let's that also in this
case.

This makes the failure in #10526 much less likely, but doesn't eliminate it
completely. Stay tuned.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2018-12-13 14:35:15 +01:00
parent ea887be00b
commit b887c8b8a8
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/shared/dissect-image.c
View file

@ -221,6 +221,8 @@ static int loop_wait_for_partitions_to_appear(
sd_device_enumerator **ret_enumerator) {
int r;
log_debug("Waiting for device (parent + %d partitions) to appear...", num_partitions);
for (unsigned i = 0; i < N_DEVICE_NODE_LIST_ATTEMPTS; i++) {
r = wait_for_partitions_to_appear(fd, d, num_partitions, ret_enumerator);
if (r != -EAGAIN)
@ -320,6 +322,10 @@ int dissect_image(
if (!m)
return -ENOMEM;
r = sd_device_new_from_devnum(&d, 'b', st.st_rdev);
if (r < 0)
return r;
if (!(flags & DISSECT_IMAGE_GPT_ONLY) &&
(flags & DISSECT_IMAGE_REQUIRE_ROOT)) {
const char *usage = NULL;
@ -353,6 +359,10 @@ int dissect_image(
m->encrypted = streq_ptr(fstype, "crypto_LUKS");
r = loop_wait_for_partitions_to_appear(fd, d, 0, &e);
if (r < 0)
return r;
*ret = TAKE_PTR(m);
return 0;
@ -374,10 +384,6 @@ int dissect_image(
if (!pl)
return -errno ?: -ENOMEM;
r = sd_device_new_from_devnum(&d, 'b', st.st_rdev);
if (r < 0)
return r;
r = loop_wait_for_partitions_to_appear(fd, d, blkid_partlist_numof_partitions(pl), &e);
if (r < 0)
return r;