]> git.ipfire.org Git - thirdparty/systemd.git/commit - src/shared/discover-image.c
dissect: allow confext/sysext to be in the same image
authorLennart Poettering <lennart@poettering.net>
Tue, 10 Oct 2023 14:04:51 +0000 (16:04 +0200)
committerLennart Poettering <lennart@poettering.net>
Wed, 11 Oct 2023 13:56:08 +0000 (15:56 +0200)
commita81fe93e9532bd3286f21ca0696208eb474f686c
treec929ab46ada06773313b0574ed263b9af517ad67
parent1c5cc6c552cd9e178b4e4293ced42085c0caff96
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.
src/basic/os-util.h
src/dissect/dissect.c
src/shared/discover-image.c
src/shared/discover-image.h
src/shared/dissect-image.c
src/shared/dissect-image.h
src/sysext/sysext.c
test/units/testsuite-29.sh
test/units/testsuite-50.sh