bootloader: Chroot into composefs image root for bootupd installs#2302
Open
cgwalters wants to merge 2 commits into
Open
bootloader: Chroot into composefs image root for bootupd installs#2302cgwalters wants to merge 2 commits into
cgwalters wants to merge 2 commits into
Conversation
This is less ostree specific; prep work for issue bootc-dev#2270, which wants the composefs backend to use the same chroot mechanism. Signed-off-by: Colin Walters <walters@verbum.org>
Closes: bootc-dev#2270 Like the ostree backend, run bootupctl inside a chroot of the target system rather than the host, so we use the bootupd binaries and plugins shipped in the deployed container image. This is needed for use cases like Anaconda. This turned out to be fairly complicated though in terms of how we set up the bind mounts; see the code for details. Generated-by: https://github.com/cgwalters/#llms Signed-off-by: Colin Walters <walters@verbum.org>
Johan-Liebert1
approved these changes
Jul 10, 2026
Johan-Liebert1
left a comment
Johan-Liebert1
left a comment
Collaborator
There was a problem hiding this comment.
Overall looks good
| // that happens, the self-bind would duplicate it into an | ||
| // orphaned/shadowed mountinfo entry that's still visible to naive | ||
| // `findmnt`-based scans (like bootupd's), causing it to pick the wrong | ||
| // filesystem UUID. See the commit introducing this comment for details. |
Collaborator
There was a problem hiding this comment.
Nit: The commit just points back to the code
|
|
||
| /// Open the mounted ESP as a capability-safe directory. | ||
| /// | ||
| /// This only succeeds while the ESP is actually mounted, i.e. from |
Collaborator
There was a problem hiding this comment.
Isn't this false because the directory might already exist?
Collaborator
There was a problem hiding this comment.
Maybe we can have a bool with the mount state or make this an Option?
| /// `target` (a path inside the chroot). Unlike [`Self::bind`], mounts | ||
| /// nested under `source` on the host are *not* carried over into the | ||
| /// chroot, leaving any mountpoint directories beneath `target` empty. | ||
| pub fn bind_flat( |
Collaborator
There was a problem hiding this comment.
Maybe better to call this one bind_non_recursive?
github-merge-queue
Bot
removed this pull request from the merge queue due to failed status checks
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.
No description provided.