Backport upstream fixes for our kernel-install plugins #300
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
This can be simply accomplished with the KERNEL_INSTALL_INITRD_GENERATOR and KERNEL_INSTALL_UKI_GENERATOR variables. `60-ukify.install` looks for the initrd in the KERNEL_INSTALL_STAGING_AREA and then takes care of building the uki. This change makes it possible to use a configuration like this: /etc/kernel/install.conf layout=uki uki_generator=ukify initrd_generator=dracut Without this change this configuration will fail since dracut would also generate an uki instead of initrd, which will cause a problem in `60-ukify.install` since it can't find an initrd to use. Signed-off-by: Andrew Ammerlaan <[email protected]> (cherry picked from commit 1664563)
When the supplied kernel image is a UKI, there's no point in creating initramfs as the UKI has it built-in already. This is the situation when dracut.install is called for a distro shipped UKI. Note, KERNEL_INSTALL_IMAGE_TYPE == "uki" is different from KERNEL_INSTALL_LAYOUT == "uki", the later can be used to create UKI upon installing a standard kernel image. Signed-off-by: Vitaly Kuznetsov <[email protected]> (cherry picked from commit b2af8c8)
…ovided If `kernel-install add` is called specifying one or more INITRD-FILEs, the caller just wants to use these, so there is no point in generating a new one. Co-authored-by: Zbigniew Jędrzejewski-Szmek <[email protected]>
The `sort-key` field was added in systemd/systemd#22519 and is used by systemd-boot to sort boot entries. Without it, rescue entries generated by this plugin are not sorted properly. This patch mimics systemd/systemd@d23b3bfd
…wise For backwards compat, if it not set, continue as before. But if set to something else, skip our kernel-install plugins. This allows an explicit configuration of the initrd generation mechanism. (cherry picked from commit 0b4be69)
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.
No description provided.