From 98f8a718c161d45b0001ee68f2ec7d111da79397 Mon Sep 17 00:00:00 2001 From: Topi Miettinen Date: Mon, 9 Mar 2020 14:01:06 +0200 Subject: [PATCH] dissect-image: avoid scanning partitions 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. (cherry picked from commit 0108c42f59dd5848f6b561f260dc6ff3e19d651b) --- src/shared/dissect-image.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/shared/dissect-image.c b/src/shared/dissect-image.c index 1ac6549ba5..1ef69fdf4c 100644 --- a/src/shared/dissect-image.c +++ b/src/shared/dissect-image.c @@ -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; -- 2.25.1