]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
sd-boot: Remove unnecessary TPM conditionalization
authorJan Janssen <medhefgo@web.de>
Mon, 27 Sep 2021 10:29:00 +0000 (12:29 +0200)
committerLennart Poettering <lennart@poettering.net>
Tue, 12 Oct 2021 07:56:02 +0000 (09:56 +0200)
This is already done in measure.h.

src/boot/efi/cpio.c

index 10a044cc926a169005a15f631fec297aa9d32984..e20615633f2716229ee9d8a7a160f695d859b6e7 100644 (file)
@@ -449,7 +449,6 @@ EFI_STATUS pack_cpio(
         if (EFI_ERROR(err))
                 return log_error_status_stall(err, L"Failed to pack cpio trailer: %r");
 
-#if ENABLE_TPM
         err = tpm_log_event(
                         tpm_pcr,
                         POINTER_TO_PHYSICAL_ADDRESS(buffer),
@@ -457,7 +456,6 @@ EFI_STATUS pack_cpio(
                         tpm_description);
         if (EFI_ERROR(err))
                 log_error_stall(L"Unable to add initrd TPM measurement for PCR %u (%s), ignoring: %r", tpm_pcr, tpm_description, err);
-#endif
 
         *ret_buffer = TAKE_PTR(buffer);
         *ret_buffer_size = buffer_size;