dissect: allow confext/sysext to be in the same image

This reworks the image discovery logic, and conceptually allows DDIs
that are both confext and sysext to exist. Previously we'd only extract
one type of exension data from a DDI, with this we allow to extract both
if both exist.

This doesn't add support for true "multi-modal" DDIs, that qualify as
various things at once, it just lays some ground work that ensures we at
least can dissect such images.

This reworks 484d26dac1e8e543fc9e300e3c1fa36be0769f7d quite a bit.

This changes systemd-dissect's JSON output, but given the
version with the fields it changes/dops has never been released (as the
above patch was merged post-v254) this shouldn't be an issue.

1 files changed, 1 insertions, 1 deletions

diff --git a/src/sysext/sysext.c b/src/sysext/sysext.c
index 784accc15d..becfbab44e 100644
--- a/src/sysext/sysext.c
+++ b/src/sysext/sysext.c
@@ -741,7 +741,7 @@ static int merge_subprocess(Hashmap *images, const char *workspace) {
                                         host_os_release_version_id,
                                         host_os_release_api_level,
                                         in_initrd() ? "initrd" : "system",
-                                        img->extension_release,
+                                        image_extension_release(img, arg_image_class),
                                         arg_image_class);
                         if (r < 0)
                                 return r;