sysroot: Load bootloader configs via boot_fd #3407
Merged
Conversation
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
There was a problem hiding this comment.
Copilot reviewed 3 out of 3 changed files in this pull request and generated no comments.
Comments suppressed due to low confidence (1)
src/libostree/ostree-sysroot.c:648
- Ensure that unit tests cover the scenario where the boot directory is missing, triggering this branch and returning an empty loader configuration set.
if (self->boot_fd == -1)
This was a general principle cleanup, preparation for handling VFAT for /boot for systemd-boot/BLS support. However I ran into an ugly corner case in our unit tests that pointed at a sysroot without a boot directory. The previous logic handled ENOENT for boot/loader but not /boot. Continue to cope with that degenerate situation. Signed-off-by: Colin Walters <walters@verbum.org>
d7c37ff to
081e9da
Compare
allisonkarlitskaya
approved these changes
Apr 16, 2025
| @@ -338,9 +338,38 @@ ensure_sysroot_fd (OstreeSysroot *self, GError **error) | |||
| return TRUE; | |||
| } | |||
|
|
|||
| /* Require that both self->sysroot_fd is set. | |||
There was a problem hiding this comment.
Both self->sysroot_fd and... what?
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.
This was a general principle cleanup, preparation
for handling VFAT for /boot for systemd-boot/BLS
support.
However I ran into an ugly corner case in our
unit tests that pointed at a sysroot without a
boot directory. The previous logic handled
ENOENT for boot/loader but not /boot.
Continue to cope with that degenerate situation.