many: reconfigure piboot on gadget refreshes - #17026
Merged
Meulengracht merged 2 commits intoMay 12, 2026
Merged
Conversation
github-actions
Bot
added
the
Run only one system
Codecov Report❌ Patch coverage is Additional details and impacted files@@ Coverage Diff @@
## master #17026 +/- ##
==========================================
- Coverage 79.07% 79.06% -0.02%
==========================================
Files 1370 1378 +8
Lines 190982 191593 +611
Branches 2465 2465
==========================================
+ Hits 151028 151474 +446
- Misses 30864 30993 +129
- Partials 9090 9126 +36
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
|
Tue May 12 12:35:45 UTC 2026 Failures:Preparing:
Executing:
Restoring:
Skipped tests from snapd-testing-skipIf you wish to have any of the below tests run in your PR, in your PR description, add 'unskip:' followed by a copy-and-pasted list (without variants) of the below tests you wish to run (unskip plus test list must be valid yaml)
|
Meulengracht
changed the title
Meulengracht
force-pushed
the
bugfix/piboot-config-observer
branch
from
May 7, 2026 08:08
3032e69 to
59a7973
Compare
Meulengracht
force-pushed
the
bugfix/piboot-config-observer
branch
from
May 7, 2026 08:21
7369b51 to
f9a3207
Compare
Meulengracht
marked this pull request as ready for review
May 7, 2026 08:22
github-actions
Bot
removed
the
Run only one system
| if err != nil { | ||
| return err | ||
| } | ||
| if env.Get("snapd_recovery_mode") == "run" && env.Get("kernel_status") != "try" { |
Member
There was a problem hiding this comment.
Should we warn if we are in try? I do not think this code should be called then. We do need to mark the boot successful before we update the gadget.
Contributor
There was a problem hiding this comment.
To me this part is confusing, why is it needed to remove tryboot.txt here? Isn't this done alredy in SetBootVars?
Member
Author
There was a problem hiding this comment.
You guys are right - this was copied by a mistake while making this from SetBootVars. This cleanup is unneccessary.
alfonsosanchezbeato
left a comment
alfonsosanchezbeato
left a comment
Contributor
There was a problem hiding this comment.
Thanks, question
| if err != nil { | ||
| return err | ||
| } | ||
| if env.Get("snapd_recovery_mode") == "run" && env.Get("kernel_status") != "try" { |
Contributor
There was a problem hiding this comment.
To me this part is confusing, why is it needed to remove tryboot.txt here? Isn't this done alredy in SetBootVars?
valentindavid
approved these changes
May 8, 2026
alfonsosanchezbeato
approved these changes
May 8, 2026
alfonsosanchezbeato
left a comment
alfonsosanchezbeato
left a comment
Contributor
There was a problem hiding this comment.
LGTM, thanks
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
3 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.
During pi-boot gadget updates, the
os_prefixvalue did not get preserved. This kind of update happens rarely in normal cases (the pi-boot structure must have it's edition changed), and even during normal refreshes, if the kernel is updated in the same transaction this does not happen (because kernel updates refreshes theos_prefixvalue, and kernel is always updated after gadget).This is not the case for remodelling, as we use a different update policy here. During remodelling we update all gadget structures except for MBR. That's why this behaviour is triggered every time on remodelling where we don't do single-reboot either, meaning we update the gadget isolated (update gadget, reboot), and this leaves
os_prefixempty, and the system unable to boot again.Currently remodelling is broken for raspberry pi's that use pi-boot, this implements the needed step to always reconfigure the pi-boot bootloader on gadget refreshes.