composefs: Hold /boot open while a deployment is staged - #2496
Merged
cgwalters merged 1 commit intoSep 25, 2026
Merged
Conversation
cgwalters-bot
force-pushed
the
bot/finalize-staged-hold
branch
from
September 24, 2026 17:51
013018a to
31df035
Compare
cgwalters
requested changes
Sep 24, 2026
cgwalters-bot
force-pushed
the
bot/finalize-staged-hold
branch
from
September 24, 2026 20:27
31df035 to
a6b6a5c
Compare
Copy over the logic from ostreedev/ostree@f3db79e7 ("finalize-staged: Ensure /boot automount doesn't expire") to composefs as well. In order to properly handle shutdown we need to ensure we have a file descriptor open on /boot, so that its automount can't expire. This fixes the plan-44 "guest reboot timeout" CI flake, see https://gist.github.com/cgwalters-bot/b51f1c81144092d70577ff9b80cda556 Generated-by: AI Signed-off-by: Colin Walters <walters@verbum.org>
cgwalters
force-pushed
the
bot/finalize-staged-hold
branch
from
September 24, 2026 21:52
a6b6a5c to
c927d9c
Compare
cgwalters
enabled auto-merge (rebase)
September 25, 2026 00:57
cgwalters
approved these changes
Sep 25, 2026
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.
Copy over the logic from ostreedev/ostree@f3db79e7 ("finalize-staged: Ensure /boot automount doesn't expire") to composefs as well: a new
bootc-finalize-staged-hold.service, pulled in bybootc-finalize-staged.service, keeps a file descriptor open on/bootwhile a deployment is staged, so its automount can't expire and race with finalization at shutdown.This fixes the plan-44 "guest reboot timeout" CI flake; see the CI analysis. It would also make
RequiresMountsFor=/booton the finalize unit (#2488) safe.Testing: on CentOS Stream 10 composefs images, rebooting right inside the automount expire window hung and booted the old deployment 4/4 times on main, and 0/10 times with this change.
plan-44-shadow-fixuppasses, as dojust validateandjust unit-tests.test-44now also checks that staging starts the hold unit.bootc requires DCO: the commit has no
Signed-off-by, so a maintainer must sign off before merging (e.g.git rebase --signoff <base>and force-push).Generated-by: https://github.com/cgwalters/#llms