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
d73cc24e11

(cherry picked from commit 0da319f566)
This commit is contained in:
Colin Walters 2024-08-22 09:38:07 -04:00 committed by Micah Abbott
parent e070839bff
commit 7d31fac720
2 changed files with 4 additions and 4 deletions

View File

@ -6,13 +6,13 @@ postprocess:
cat > /usr/lib/dracut/dracut.conf.d/20-bootc-base.conf << 'EOF' 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 # We want a generic image; hostonly makes no sense as part of a server side build
hostonly=no hostonly=no
dracutmodules+=" kernel-modules dracut-systemd systemd-initrd base ostree " add_dracutmodules+=" kernel-modules dracut-systemd systemd-initrd base ostree "
EOF EOF
cat > /usr/lib/dracut/dracut.conf.d/22-bootc-generic.conf << '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 # Extra modules that we want by default that are known to exist in the kernel
dracutmodules+=" virtiofs " add_dracutmodules+=" virtiofs "
EOF EOF
cat > /usr/lib/dracut/dracut.conf.d/49-bootc-tpm2-tss.conf << 'EOF' cat > /usr/lib/dracut/dracut.conf.d/49-bootc-tpm2-tss.conf << 'EOF'
# We want this for systemd-cryptsetup tpm2 locking # We want this for systemd-cryptsetup tpm2 locking
dracutmodules+=" tpm2-tss " add_dracutmodules+=" tpm2-tss "
EOF EOF

View File

@ -4,5 +4,5 @@ postprocess:
#!/usr/bin/env bash #!/usr/bin/env bash
mkdir -p /usr/lib/dracut/dracut.conf.d mkdir -p /usr/lib/dracut/dracut.conf.d
cat > /usr/lib/dracut/dracut.conf.d/30-bootc-tier-1.conf << 'EOF' cat > /usr/lib/dracut/dracut.conf.d/30-bootc-tier-1.conf << 'EOF'
dracutmodules+=" lvm crypt fips " add_dracutmodules+=" lvm crypt fips "
EOF EOF