diff options
author | Lennart Poettering <lennart@poettering.net> | 2018-12-19 17:17:35 +0100 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2018-12-19 23:27:47 +0100 |
commit | 052eaf5c9302ac64f1de965babfaf9c120740f73 (patch) | |
tree | 98134869033fb615b95d8e74265d5410d40b9b19 /src/gpt-auto-generator | |
parent | 2141bedb39a5abe4564ba8df44a78f4b3668b830 (diff) | |
download | systemd-052eaf5c9302ac64f1de965babfaf9c120740f73.tar.gz |
gpt-auto-generator: don't wait for udev
Generators run in a context where waiting for udev is not an option,
simply because it's not running there yet. Hence, let's not wait for it
in this case.
This is generally OK to do as we are operating on the root disk only
here, which should have been probed already by the time we come this
far.
An alternative fix might be to remove the udev dependency from image
dissection again in the long run (and thus replace reliance on
/dev/block/x:y somehow with something else).
Fixes: #11205
Diffstat (limited to 'src/gpt-auto-generator')
-rw-r--r-- | src/gpt-auto-generator/gpt-auto-generator.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gpt-auto-generator/gpt-auto-generator.c b/src/gpt-auto-generator/gpt-auto-generator.c index a6d7bcc755..e9f3d7dab2 100644 --- a/src/gpt-auto-generator/gpt-auto-generator.c +++ b/src/gpt-auto-generator/gpt-auto-generator.c @@ -518,7 +518,7 @@ static int enumerate_partitions(dev_t devnum) { if (r <= 0) return r; - r = dissect_image(fd, NULL, 0, DISSECT_IMAGE_GPT_ONLY, &m); + r = dissect_image(fd, NULL, 0, DISSECT_IMAGE_GPT_ONLY|DISSECT_IMAGE_NO_UDEV, &m); if (r == -ENOPKG) { log_debug_errno(r, "No suitable partition table found, ignoring."); return 0; |