First half of compatibility with mkosi v15+ #69
Merged
+60
−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
The default mkosi version and system configuration there needs them. Signed-off-by: Marc Herbert <[email protected]>
run_qemu.sh
Outdated
| process_mkosi_template() | ||
| { | ||
| local src="$1" | ||
| < "$1" sed \ |
There was a problem hiding this comment.
Should this use "$src" since we just defined it?
Also why not use sed <args> "$src" instead of redirection (easier to read maybe?) - and if we do want to use stdin redirection, maybe use the more canonical form of sed <args> < "$src" ?
There was a problem hiding this comment.
Could catch; that's a leftover from a previous iteration.
|
All other changes look good to me. |
This is needed to move to multiple configuration files. Signed-off-by: Marc Herbert <[email protected]>
More user-friendly and avoids accidental edits. Signed-off-by: Marc Herbert <[email protected]>
Switch generated mkosi configuration from a single file to multiple files" either `mkosi.default.d/*.conf` or `mkosi.default.d/*.conf` depending on the mkosi version. Zero functional change: for now the effective configuration should be the same in both directories and as before. But this is the major step towards supporting mkosi versions 15 and above. Signed-off-by: Marc Herbert <[email protected]>
stellarhopper
approved these changes
Dec 4, 2024
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.
First half of bigger #68
Not compatible with mkosi v15+ yet (only the first half) but goes a long way.