]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
sd-stub: Fixup typo & measurement order
authorAdrian Vovk <adrianvovk@gmail.com>
Tue, 1 Oct 2024 20:29:47 +0000 (22:29 +0200)
committerAdrian Vovk <adrianvovk@gmail.com>
Tue, 26 Nov 2024 21:33:09 +0000 (16:33 -0500)
A previous commit accidentally reversed the measurement order of the
confext initrds and sysext initrds via a minor typo. This commit fixes
the typo and restores the original measurement order

Follow-up: ac32323

src/boot/stub.c

index c92df686c8a96912570bab84bfa7266245832532..cf990df2e732ff64f11e36f688151e45746b640f 100644 (file)
@@ -858,7 +858,7 @@ static void generate_sidecar_initrds(
                       /* access_mode= */ 0444,
                       /* tpm_pcr= */ TPM2_PCR_SYSEXTS,
                       u"System extension initrd",
-                      initrds + INITRD_CONFEXT,
+                      initrds + INITRD_SYSEXT,
                       &m) == EFI_SUCCESS)
                 combine_measured_flag(sysext_measured, m);
 
@@ -871,7 +871,7 @@ static void generate_sidecar_initrds(
                       /* access_mode= */ 0444,
                       /* tpm_pcr= */ TPM2_PCR_KERNEL_CONFIG,
                       u"Configuration extension initrd",
-                      initrds + INITRD_SYSEXT,
+                      initrds + INITRD_CONFEXT,
                       &m) == EFI_SUCCESS)
                 combine_measured_flag(confext_measured, m);
 }