summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAdrian Vovk <adrianvovk@gmail.com>2024-10-01 22:29:47 +0200
committerAdrian Vovk <adrianvovk@gmail.com>2024-11-26 22:33:09 +0100
commit5a10a9a3bb18094bccaa835a40685984e22ba40a (patch)
tree372078a82608f6dcac641db5e53b0aa59a60c26e /src
parentsysext: set SELinux context for hierarchies and workdir (diff)
downloadsystemd-5a10a9a3bb18094bccaa835a40685984e22ba40a.tar.xz
systemd-5a10a9a3bb18094bccaa835a40685984e22ba40a.zip
sd-stub: Fixup typo & measurement order
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
Diffstat (limited to '')
-rw-r--r--src/boot/stub.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/boot/stub.c b/src/boot/stub.c
index c92df686c8..cf990df2e7 100644
--- a/src/boot/stub.c
+++ b/src/boot/stub.c
@@ -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);
}