kernel-install: install addons in 90-uki-copy.install if they are present#36218
Merged
yuwata merged 1 commit intosystemd:mainfrom Feb 1, 2025
Merged
kernel-install: install addons in 90-uki-copy.install if they are present#36218yuwata merged 1 commit intosystemd:mainfrom
yuwata merged 1 commit intosystemd:mainfrom
Conversation
…sent mkosi now has a kernel-install plugin to build addons, mkosi-addon. If there are addons in <uki>.extra.d/ install them too to the ESP.
github-actions
bot
added
the
please-review
yuwata
approved these changes
Feb 1, 2025
github-actions
bot
removed
the
please-review
poettering
reviewed
Feb 4, 2025
| UKI_FILE="$UKI_DIR/$ENTRY_TOKEN-$KERNEL_VERSION.efi" | ||
| fi | ||
|
|
||
| ADDON_DIR="$UKI_DIR/$ENTRY_TOKEN-$KERNEL_VERSION.efi.extra.d" |
Member
There was a problem hiding this comment.
hmm, this variable's name is a bit of a misnomer, since the ….extra.d/ subdir contains all four kinds of side-cars we have:
- UEFI addons
- credentials
- confext
- sysext
hence rename this variable EXTRA_DIR?
Member
There was a problem hiding this comment.
also, can you add document the new logic, i.e. in kernel-install(8) there should be a line about these sidecards being copied too where the plugins are discussed under "add"
Member
There was a problem hiding this comment.
(oh, and maybe also document at the same time that on "remove" (i.e. further down) the 90-uki-copy.install drop-in will not just delete the EFI binary again, but all sidecars too (i.e. the extra.d/ stuff): this it always did, but let's please document that at the same time, to make it symmetric
yuwata
added a commit
to yuwata/systemd
that referenced
this pull request
Feb 7, 2025
As the directory contains not only addons, but also credentials and extensions. No functional change, just refactoring. Follow-up for 75ee025. Addresses the post-merge comment systemd#36218 (comment).
yuwata
added a commit
to yuwata/systemd
that referenced
this pull request
Feb 7, 2025
Addresses the post-merge comments in systemd#36218.
yuwata
added a commit
to yuwata/systemd
that referenced
this pull request
Feb 7, 2025
As the directory contains not only addons, but also credentials and extensions. No functional change, just refactoring. Follow-up for 75ee025. Addresses the post-merge comment systemd#36218 (comment).
yuwata
added a commit
to yuwata/systemd
that referenced
this pull request
Feb 7, 2025
Addresses the post-merge comments in systemd#36218.
yuwata
added a commit
that referenced
this pull request
Feb 7, 2025
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.
mkosi now has a kernel-install plugin to build addons, mkosi-addon. If there are addons in .extra.d/ install them too to the ESP.