UKI print dump diff#2315
Open
Johan-Liebert1 wants to merge 2 commits into
Open
Conversation
If we have a UKI digest mismatch error, we now print the dumpfile diff, if a dumpfile is present at `/boot/$kver.dump` Closes: bootc-dev#2313 Signed-off-by: Pragyan Poudyal <pragyanpoudyal41999@gmail.com>
Signed-off-by: Pragyan Poudyal <pragyanpoudyal41999@gmail.com>
Johan-Liebert1
force-pushed
the
uki-print-dump-diff
branch
from
e217459 to
c9d209d
Compare
cgwalters
reviewed
Jul 15, 2026
| .and_then(|x| x.strip_suffix(EFI_EXT).map(|x| format!("{x}.dump"))); | ||
|
|
||
| let Some(dumpfile_name) = &dumpfile_name else { | ||
| tracing::warn!("Dumpfile not found for diff"); |
Collaborator
There was a problem hiding this comment.
This is a normal situation, not a warning case.
Collaborator
Author
There was a problem hiding this comment.
Right. I'll change it to info
Collaborator
Author
There was a problem hiding this comment.
or debug maybe
| let mut tmpfile = tempdir.create("current")?; | ||
| dumpfile::write_dumpfile(&mut tmpfile, &fs).context("Writing dumpfile")?; | ||
|
|
||
| let mut cmd = std::process::Command::new("diff"); |
Collaborator
There was a problem hiding this comment.
I think we can use https://crates.io/crates/similar
Collaborator
Author
There was a problem hiding this comment.
This doesn't seem to accept files as params, only strings, ranges etc. Reading the entire diff into memory is okay-ish I guess as it's usually around < 20M
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
cfs/uki: Print dumpfile diff on UKI digest mismatch
If we have a UKI digest mismatch error, we now print the dumpfile diff,
if a dumpfile is present at
/boot/$kver.dumpCloses: #2313