core-initrd,snap-bootstrap: look at env to mount directly to /sysroot #15076
+39
−12
Conversation
This file contains 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
alfonsosanchezbeato
requested review from
valentindavid,
pedronis and
ZeyadYasser
|
@ZeyadYasser this is probably the situation that you hit (24 kernel used in a 22 model). |
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## master #15076 +/- ##
=========================================
Coverage ? 78.14%
=========================================
Files ? 1173
Lines ? 157782
Branches ? 0
=========================================
Hits ? 123296
Misses ? 26838
Partials ? 7648
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
|
Wed Feb 19 15:45:59 UTC 2025 Failures:Preparing:
Executing:
Restoring:
|
alfonsosanchezbeato
added
the
Run nested
pedronis
requested changes
Feb 14, 2025
| return false | ||
| default: | ||
| func createSysrootMount() bool { | ||
| isCore24plus := osGetenv("CORE24_PLUS_INITRAMFS") |
There was a problem hiding this comment.
I think we want a comment in code here, why we want to this based on initramfs and not the UC/hybrid version
There was a problem hiding this comment.
Good point, I've added a comment
ZeyadYasser
approved these changes
Feb 17, 2025
There was a problem hiding this comment.
LGTM, Thank you!
I tested it against the exact scenario (core22 base with a 24 kernel) and it passed installation and first boot. Test used for testing is from #14867.
| case "core20", "core22", "core22-desktop": | ||
| return false | ||
| default: | ||
| func createSysrootMount() bool { |
There was a problem hiding this comment.
Suggested change
| func createSysrootMount() bool { | |
| func shouldCreateSysrootMount() bool { |
Comment on lines
1880
to
1883
| if isCore24plus == "1" || isCore24plus == "true" { | ||
| return true | ||
| } | ||
| return false |
There was a problem hiding this comment.
Suggested change
| if isCore24plus == "1" || isCore24plus == "true" { | |
| return true | |
| } | |
| return false | |
| return isCore24plus == "1" || isCore24plus == "true" |
Previously we looked at the model and mounted base/rootfs directly if it was Ubuntu 24+. Now, we check instead an environment variable that is set if the initramfs is 24+. This is done so now the kernels that contain the 24+ initramfs can be booted in older Ubuntu releases with older bases. This situation is not something we really support, as the systemd of the initramfs will not match the one in the system, but it is something that could happen while remodeling and it seems safer to allow this at least temporarily.
alfonsosanchezbeato
force-pushed
the
run-24-kernel-older-uc
branch
from
9f90c64 to
5dfbe1e
Compare
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.
Previously we looked at the model and mounted base/rootfs directly if it was Ubuntu 24+. Now, we check instead an environment variable that is set if the initramfs is 24+.
This is done so now the kernels that contain the 24+ initramfs can be booted in older Ubuntu releases with older bases. This situation is not something we really support, as the systemd of the initramfs will not match the one in the system, but it is something that could happen while remodeling and it seems safer to allow this at least temporarily.