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

dissect-image: avoid scanning partitions

Browse source 
In case the dissected image has a filesystem, don't scan for partitions. This
avoids problems with services using a `RootImage=` in early boot when udevd is
not yet started.
This commit is contained in:
Topi Miettinen 2020-03-09 14:01:06 +02:00 committed by Zbigniew Jędrzejewski-Szmek
parent 3b5b6826aa
commit 0108c42f59
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -425,10 +425,11 @@ int dissect_image(
m->encrypted = streq_ptr(fstype, "crypto_LUKS");
r = loop_wait_for_partitions_to_appear(fd, d, 0, flags, &e);
if (r < 0)
return r;
if (!streq(usage, "filesystem")) {
r = loop_wait_for_partitions_to_appear(fd, d, 0, flags, &e);
if (r < 0)
return r;
}
*ret = TAKE_PTR(m);
return 0;