config: Fix InitrdPackages not being added with default #4115
+3
−3
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
The check `s.dest in main.config` in finalize_default_initrd() is unreliable - initrd_packages is often not present in main.config even when specified in configuration files, causing values to fall through to context.defaults. When mkosi-initrd/mkosi.conf is parsed, the parser only checks context.config (not context.defaults), so user packages are not seen and cannot be merged. Additionally, during finalization, context.config takes priority over context.defaults, causing user packages to be lost. Fix by always using context.config for non-CLI initrd settings, ensuring they are visible to the parser and get properly merged with the mkosi-initrd default packages via the list parser. Fixes systemd#4114
val4oss
force-pushed
the
fix-initrd-packages-default
branch
from
f55d09d to
4765c49
Compare
val4oss
changed the title
Contributor
|
Not quite correct, my pr has the correct fix |
Contributor
Author
|
Thank you for the correct fix. |
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.
The check
s.dest in main.configin finalize_default_initrd() is unreliable - initrd_packages is often not present in main.config even when specified in configuration files, causing values to fall through to context.defaults.When mkosi-initrd/mkosi.conf is parsed, the parser only checks context.config (not context.defaults), so user packages are not seen and cannot be merged. Additionally, during finalization, context.config takes priority over context.defaults, causing user packages to be lost.
Fix by always using context.config for non-CLI initrd settings, ensuring they are visible to the parser and get properly merged with the mkosi-initrd default packages via the list parser.
Fixes #4114