-
Notifications
You must be signed in to change notification settings - Fork 50
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
sys-boot/grub: Apply Red Hat's large patch set (and drop Gentoo's) #2431
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
jepio
reviewed
Nov 7, 2024
We initially thought we would need Red Hat's patch set. Then it looked like we wouldn't because the TPM Event Log appeared to work without it. We later discovered that on amd64, it only works with Secure Boot disabled. The patch set also fixes Secure Boot on arm64, which would have otherwise needed a couple of patches from Canonical. We have to drop Gentoo's patches because they conflict, but they don't affect Flatcar anyway. Signed-off-by: James Le Cuirot <[email protected]>
This fix has been submitted to Red Hat. It will hopefully be merged soon. Signed-off-by: James Le Cuirot <[email protected]>
chewi
force-pushed
the
chewi/grub-redhat-patches
branch
from
November 7, 2024 14:26
adffe94
to
e0109ef
Compare
ader1990
reviewed
Nov 8, 2024
sdk_container/src/third_party/coreos-overlay/coreos/user-patches/sys-boot/grub/README.md
Show resolved
Hide resolved
sayanchowdhury
approved these changes
Nov 8, 2024
ader1990
approved these changes
Nov 8, 2024
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ran a k8s full deployment locally, works as expected.
dongsupark
reviewed
Nov 8, 2024
...arty/coreos-overlay/coreos/user-patches/sys-boot/grub/grub-2.12-01-execute-return-code.patch
Show resolved
Hide resolved
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.
Apply and fix Red Hat's GRUB patches, drop Gentoo's patches
We initially thought we would need Red Hat's patch set. Then it looked like we wouldn't because the TPM Event Log appeared to work without it. We later discovered that on amd64, it only works with Secure Boot disabled. The patch set also fixes Secure Boot on arm64, which would have otherwise needed a couple of patches from Canonical.
Red Hat's patches break the fallback mechanism, so apply additional patches to fix that. See rhboot/grub2#195.
We have to drop Gentoo's patches because they conflict, but they don't affect Flatcar anyway.
How to use
Check that the various images successfully boot.
Testing done
This Jenkins SDK run passed successfully. /boot on amd64 has grown by 450KB, which isn't ideal, but not unexpected after the last time we tried adding these patches. We're still just under 50% usage. I've just noticed that we're installing test GRUB modules for some reason, so I'll see whether we can drop those.
changelog/
directory (user-facing change, bug fix, security fix, update)/boot
and/usr
size, packages, list files for any missing binaries, kernel modules, config files, kernel modules, etc.