fix: sd-measure dtbauto and hwdids arg parsing
#35765
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
github-actions
bot
added
the
please-review
Commit 630cf4e introduced `.dtbauto`, but since it's before `.hwdids` commit 4c0b7f4 made `dtbauto` the last argument whereas it should have been `hwdids`. Otherwise the code was measuring the content of hwdids into dtbauto section and vice-versa. Found this while adding the new `dtbauto` and `.hwdids` fields in the go implementation of `sd-measure` at https://github.com/siderolabs/talos/blob/main/internal/pkg/secureboot/measure/measure.go. Signed-off-by: Noel Georgi <git@frezbo.dev>
frezbo
force-pushed
the
fix/sd-measure-arg-parsing
branch
from
19311a4 to
0c4abd7
Compare
frezbo
added a commit
to frezbo/talos
that referenced
this pull request
Dec 27, 2024
Bring in parity with systemd 257 by supporting more UKI sections. The output of `sd-measure` and our measure code will be different until systemd/systemd#35765 is fixed upstream. Signed-off-by: Noel Georgi <git@frezbo.dev>
frezbo
added a commit
to frezbo/talos
that referenced
this pull request
Dec 27, 2024
Bring in parity with systemd 257 by supporting more UKI sections. The output of `sd-measure` and our measure code will be different until systemd/systemd#35765 is fixed upstream. Signed-off-by: Noel Georgi <git@frezbo.dev>
poettering
added
good-to-merge/waiting-for-ci 👍
frezbo
added a commit
to frezbo/talos
that referenced
this pull request
Jan 3, 2025
Bring in parity with systemd 257 by supporting more UKI sections. The output of `sd-measure` and our measure code will be different until systemd/systemd#35765 is fixed upstream. Fixes: siderolabs#10075 Signed-off-by: Noel Georgi <git@frezbo.dev>
github-actions
bot
removed
the
good-to-merge/waiting-for-ci 👍
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Commit 630cf4e introduced
.dtbauto, but since it's before.hwdidscommit 4c0b7f4 madedtbautothe last argument whereas it should have beenhwdids.Otherwise the code was measuring the content of hwdids into dtbauto section and vice-versa.
Found this while adding the new
dtbautoand.hwdidsfields in the go implementation ofsd-measureathttps://github.com/siderolabs/talos/blob/main/internal/pkg/secureboot/measure/measure.go.