Skip to content

Commit 517121f

Browse files
author
CKI KWF Bot
committed
Merge: uki-virt: add systemd-repart module
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-10/-/merge_requests/1297 JIRA: https://issues.redhat.com/browse/RHEL-107274 Upstream Status: RHEL only Add systemd-repart module to dracut-virt.conf. Until RHEL-103385 is not merged, mkfs.\* is not present in dracut therefore we need to manually inject it. Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com> Approved-by: Vitaly Kuznetsov <vkuznets@redhat.com> Approved-by: Scott Weaver <scweaver@redhat.com> Approved-by: CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com> Merged-by: CKI GitLab Kmaint Pipeline Bot <26919896-cki-kmaint-pipeline-bot@users.noreply.gitlab.com>
2 parents 619323c + 23fb6ae commit 517121f

File tree

2 files changed

+7
-0
lines changed

2 files changed

+7
-0
lines changed

redhat/dracut-virt.conf

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,11 @@ dracutmodules+=" systemd-sysext "
2727
# modules: root disk integrity protection
2828
dracutmodules+=" systemd-veritysetup "
2929

30+
# modules: root creation and encryption
31+
dracutmodules+=" systemd-repart "
32+
# FIXME: remove this once RHEL-103385 is merged
33+
install_items+=" /usr/sbin/mkfs.vfat /usr/sbin/mkfs.ext4 /usr/sbin/mkfs.xfs "
34+
3035
# modules: FIPS
3136
dracutmodules+=" fips "
3237
# FIPS mode requires early crypto drivers test

redhat/kernel.spec.template

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -879,6 +879,8 @@ BuildRequires: lvm2
879879
BuildRequires: systemd-boot-unsigned
880880
# For systemd-stub and systemd-pcrphase
881881
BuildRequires: systemd-udev >= 252-1
882+
# For systemd-repart
883+
BuildRequires: xfsprogs e2fsprogs dosfstools
882884
# For UKI kernel cmdline addons
883885
BuildRequires: systemd-ukify
884886
# For TPM operations in UKI initramfs

0 commit comments

Comments
 (0)