Skip to content

Commit 8bf2343

Browse files
committed
Merge: redhat: Use systemd-pcrphase dracut module for building UKI's initramfs
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9/-/merge_requests/5132 JIRA: INTERNAL systemd-pcrphase dracut module was backported to RHEL9 and thus there's no need to include pcrphase related files manually. No functional change intended, this is just a cleanup. Signed-off-by: Vitaly Kuznetsov <[email protected]> Approved-by: Emanuele Giuseppe Esposito <[email protected]> Approved-by: Gerd Hoffmann <[email protected]> Approved-by: Herton R. Krzesinski <[email protected]> Approved-by: CKI KWF Bot <[email protected]> Merged-by: Rado Vrbovsky <[email protected]>
2 parents 2b1f8ab + c0b52da commit 8bf2343

File tree

2 files changed

+2
-5
lines changed

2 files changed

+2
-5
lines changed

redhat/dracut-virt.conf

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ dracutmodules+=" base systemd systemd-initrd dracut-systemd dbus dbus-broker usr
1212
dracutmodules+=" dm lvm rootfs-block fs-lib "
1313

1414
# modules: tpm and crypto
15-
dracutmodules+=" crypt crypt-loop tpm2-tss "
15+
dracutmodules+=" crypt crypt-loop tpm2-tss systemd-pcrphase "
1616

1717
# WALinuxagent-cvm with CVM specific udev rules
1818
dracutmodules+=" walinuxagentcvm "
@@ -39,6 +39,3 @@ drivers+=" dm_verity overlay "
3939

4040
# filesystems
4141
filesystems+=" vfat ext4 xfs overlay "
42-
43-
# systemd-pcrphase
44-
install_items+=" /lib/systemd/system/systemd-pcrphase-initrd.service /usr/lib/systemd/systemd-pcrphase /usr/lib/systemd/system/initrd.target.wants/systemd-pcrphase-initrd.service "

redhat/kernel.spec.template

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -776,7 +776,7 @@ BuildRequires: lld
776776
%endif
777777

778778
%if %{efiuki}
779-
BuildRequires: dracut >= 057-51.git20231114.el9
779+
BuildRequires: dracut >= 057-67.git20240812.el9
780780
# For dracut UEFI uki binaries
781781
BuildRequires: binutils
782782
# For the initrd

0 commit comments

Comments
 (0)