From 7d31fac720bb056f9afaa8f037fc985d9a645429 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Thu, 22 Aug 2024 09:38:07 -0400 Subject: [PATCH] initramfs: Switch to `add_dracutmodules` Per discussion in https://github.com/rhkdump/kdump-utils/pull/29#issuecomment-2303932537 This would have avoided kdump breakage, and the original motivation of avoiding dracut error spam from missing things is gone now that Fedora is using dracut-ng which has https://github.com/dracut-ng/dracut-ng/commit/d73cc24e112c01aa701a96a7b8a58adce78409e7 (cherry picked from commit 0da319f566f1eb6bc34269914d766b028e2ef376) --- tier-0/initramfs.yaml | 6 +++--- tier-1/initramfs-full.yaml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tier-0/initramfs.yaml b/tier-0/initramfs.yaml index de65333..353524c 100644 --- a/tier-0/initramfs.yaml +++ b/tier-0/initramfs.yaml @@ -6,13 +6,13 @@ postprocess: cat > /usr/lib/dracut/dracut.conf.d/20-bootc-base.conf << 'EOF' # We want a generic image; hostonly makes no sense as part of a server side build hostonly=no - dracutmodules+=" kernel-modules dracut-systemd systemd-initrd base ostree " + add_dracutmodules+=" kernel-modules dracut-systemd systemd-initrd base ostree " EOF cat > /usr/lib/dracut/dracut.conf.d/22-bootc-generic.conf << 'EOF' # Extra modules that we want by default that are known to exist in the kernel - dracutmodules+=" virtiofs " + add_dracutmodules+=" virtiofs " EOF cat > /usr/lib/dracut/dracut.conf.d/49-bootc-tpm2-tss.conf << 'EOF' # We want this for systemd-cryptsetup tpm2 locking - dracutmodules+=" tpm2-tss " + add_dracutmodules+=" tpm2-tss " EOF diff --git a/tier-1/initramfs-full.yaml b/tier-1/initramfs-full.yaml index 29e91ee..2c55a83 100644 --- a/tier-1/initramfs-full.yaml +++ b/tier-1/initramfs-full.yaml @@ -4,5 +4,5 @@ postprocess: #!/usr/bin/env bash mkdir -p /usr/lib/dracut/dracut.conf.d cat > /usr/lib/dracut/dracut.conf.d/30-bootc-tier-1.conf << 'EOF' - dracutmodules+=" lvm crypt fips " + add_dracutmodules+=" lvm crypt fips " EOF