]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
stub: fix conditionalization of initrd assembly
authorLennart Poettering <lennart@poettering.net>
Wed, 21 Sep 2022 14:42:26 +0000 (16:42 +0200)
committerLennart Poettering <lennart@poettering.net>
Wed, 21 Sep 2022 17:43:48 +0000 (19:43 +0200)
We forgot to conditionalize this on pcrsig/pcrpkey too. So if you have
ne creds or sysext configured we actually wouldn't pass pcrsig/pcrpkey
along. Let's fix that.

src/boot/efi/stub.c

index 2e8b4d99d2224a47403912f70b200a73df9f9247..c2321aa0eb55836726ef019a80f5c8b637e4f082 100644 (file)
@@ -338,7 +338,7 @@ EFI_STATUS efi_main(EFI_HANDLE image, EFI_SYSTEM_TABLE *sys_table) {
         dt_base = dt_size != 0 ? POINTER_TO_PHYSICAL_ADDRESS(loaded_image->ImageBase) + addrs[UNIFIED_SECTION_DTB] : 0;
 
         _cleanup_pages_ Pages initrd_pages = {};
-        if (credential_initrd || global_credential_initrd || sysext_initrd) {
+        if (credential_initrd || global_credential_initrd || sysext_initrd || pcrsig_initrd || pcrpkey_initrd) {
                 /* If we have generated initrds dynamically, let's combine them with the built-in initrd. */
                 err = combine_initrd(
                                 initrd_base, initrd_size,