From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 1 Jun 2021 15:17:37 +0000 (+0200)
Subject: dissect: if dissecting without udev, don't look for usec timestamp on db record
X-Git-Tag: v249-rc1~116
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3fe398cec036ac810344b5b13b07cddcca1acd49;p=thirdparty%2Fsystemd.git

dissect: if dissecting without udev, don't look for usec timestamp on db record

There will likely be none, hence don't bother.

This fixes an issue in systemd-gpt-auto-generator where we'll try to
wait for the udev db for the partitions even though though udev might
simplynot be around and via the DISSECT_IMAGE_NO_UDEV flag were
explicitly told not to bother.

Fixes: #19377
---

diff --git a/src/shared/dissect-image.c b/src/shared/dissect-image.c
index 476e514c52e..9dbc0891c54 100644
--- a/src/shared/dissect-image.c
+++ b/src/shared/dissect-image.c
@@ -238,6 +238,7 @@ static int find_partition(
                 sd_device *parent,
                 blkid_partition pp,
                 usec_t timestamp_not_before,
+                DissectImageFlags flags,
                 sd_device **ret) {
 
         _cleanup_(sd_device_enumerator_unrefp) sd_device_enumerator *e = NULL;
@@ -255,15 +256,17 @@ static int find_partition(
         FOREACH_DEVICE(e, q) {
                 uint64_t usec;
 
-                r = sd_device_get_usec_initialized(q, &usec);
-                if (r == -EBUSY) /* Not initialized yet */
-                        continue;
-                if (r < 0)
-                        return r;
+                if (!FLAGS_SET(flags, DISSECT_IMAGE_NO_UDEV)) {
+                        r = sd_device_get_usec_initialized(q, &usec);
+                        if (r == -EBUSY) /* Not initialized yet */
+                                continue;
+                        if (r < 0)
+                                return r;
 
-                if (timestamp_not_before != USEC_INFINITY &&
-                    usec < timestamp_not_before) /* udev database entry older than our attachment? Then it's not ours */
-                        continue;
+                        if (timestamp_not_before != USEC_INFINITY &&
+                            usec < timestamp_not_before) /* udev database entry older than our attachment? Then it's not ours */
+                                continue;
+                }
 
                 r = device_is_partition(q, parent, pp);
                 if (r < 0)
@@ -332,6 +335,7 @@ static int wait_for_partition_device(
                 usec_t deadline,
                 uint64_t uevent_seqnum_not_before,
                 usec_t timestamp_not_before,
+                DissectImageFlags flags,
                 sd_device **ret) {
 
         _cleanup_(sd_event_source_unrefp) sd_event_source *timeout_source = NULL;
@@ -343,7 +347,7 @@ static int wait_for_partition_device(
         assert(pp);
         assert(ret);
 
-        r = find_partition(parent, pp, timestamp_not_before, ret);
+        r = find_partition(parent, pp, timestamp_not_before, flags, ret);
         if (r != -ENXIO)
                 return r;
 
@@ -382,7 +386,7 @@ static int wait_for_partition_device(
                 return r;
 
         /* Check again, the partition might have appeared in the meantime */
-        r = find_partition(parent, pp, timestamp_not_before, ret);
+        r = find_partition(parent, pp, timestamp_not_before, flags, ret);
         if (r != -ENXIO)
                 return r;
 
@@ -777,7 +781,7 @@ int dissect_image(
                 if (!pp)
                         return errno_or_else(EIO);
 
-                r = wait_for_partition_device(d, pp, deadline, uevent_seqnum_not_before, timestamp_not_before, &q);
+                r = wait_for_partition_device(d, pp, deadline, uevent_seqnum_not_before, timestamp_not_before, flags, &q);
                 if (r < 0)
                         return r;