From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 21 Sep 2022 14:42:26 +0000 (+0200)
Subject: stub: fix conditionalization of initrd assembly
X-Git-Tag: v252-rc1~123
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=64650de7789df52c6fa52c3684e41875cf54093c;p=thirdparty%2Fsystemd.git

stub: fix conditionalization of initrd assembly

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.
---

diff --git a/src/boot/efi/stub.c b/src/boot/efi/stub.c
index 2e8b4d99d22..c2321aa0eb5 100644
--- a/src/boot/efi/stub.c
+++ b/src/boot/efi/stub.c
@@ -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,