Fix upgrade not remounting properly #811
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
Looks like the mount lib did not called the proper options on the remount AND we couold not easily remount RO the state partition. Instead, after upgrade, just remount with bind so its immidiatly RO and we avoid in use errors. This also adds a umount/remount for the persistent partition during upgrade if it was mounted by us, to not leave stuff around Signed-off-by: Itxaka <[email protected]>
Contributor
There was a problem hiding this comment.
Pull Request Overview
This PR ensures that after an upgrade, partitions are correctly remounted as read-only using a bind remount strategy and that any persistent partition mounts are cleaned up.
- Use a bind+remount approach to enforce read-only on the state partition and avoid “device busy” errors
- Push an unmount callback for the persistent partition if it was mounted during upgrade
Reviewed Changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 2 comments.
| File | Description |
|---|---|
| pkg/elemental/elemental.go | Replace the simple remount helper with a direct syscall.Mount call using `MS_BIND |
| pkg/action/upgrade.go | Add cleanup.Push(umount) after mounting the persistent partition |
mauromorales
approved these changes
Jun 11, 2025
Use the syscall interface in the config Signed-off-by: Itxaka <[email protected]>
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #811 +/- ##
==========================================
+ Coverage 48.38% 48.41% +0.03%
==========================================
Files 48 48
Lines 6575 6579 +4
==========================================
+ Hits 3181 3185 +4
Misses 3089 3089
Partials 305 305 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
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.
Looks like the mount lib did not called the proper options on the remount AND we couold not easily remount RO the state partition.
Instead, after upgrade, just remount with bind so its immidiatly RO and we avoid in use errors.
This also adds a umount/remount for the persistent partition during upgrade if it was mounted by us, to not leave stuff around
Fix kairos-io/kairos#3416