From 708dab633579e0b737bb442be01001079d20d6d1 Mon Sep 17 00:00:00 2001
From: renner <80410025+renner0e@users.noreply.github.com>
Date: Sun, 5 Apr 2026 15:45:08 +0200
Subject: [PATCH] fix: move dracut configs to files instead of flags (#2003)

While this doesn't make a difference to our image build itself, it will
make the life easier for derived images as they will inherit all the
modules from us that we set anyway. This undoes some of the changes made
in 32a66fc7191. These are specific to the things we install here so it
doesn't make sense to go into common.
---
 build_files/base/19-initramfs.sh                           | 7 +++----
 .../dracut.conf.d/30-aurora-bootc-ostree-backend.conf      | 1 +
 .../shared/usr/lib/dracut/dracut.conf.d/90-ublue-luks.conf | 1 +
 3 files changed, 5 insertions(+), 4 deletions(-)
 create mode 100644 system_files/shared/usr/lib/dracut/dracut.conf.d/30-aurora-bootc-ostree-backend.conf
 create mode 100644 system_files/shared/usr/lib/dracut/dracut.conf.d/90-ublue-luks.conf

diff --git a/build_files/base/19-initramfs.sh b/build_files/base/19-initramfs.sh
index 498a5aaa..f4a9f57d 100755
--- a/build_files/base/19-initramfs.sh
+++ b/build_files/base/19-initramfs.sh
@@ -2,13 +2,12 @@
 
 echo "::group:: ===$(basename "$0")==="
 
-set -oue pipefail
+set -ouex pipefail
 
 KERNEL_VERSION=$(rpm -q --queryformat="%{evr}.%{arch}" kernel-core)
 
-# Ensure Initramfs is generated
 export DRACUT_NO_XATTR=1
-/usr/bin/dracut --no-hostonly --kver "${KERNEL_VERSION}" --reproducible -v --add "ostree fido2 tpm2-tss pkcs11 pcsc" -f "/lib/modules/${KERNEL_VERSION}/initramfs.img"
-chmod 0600 "/lib/modules/${KERNEL_VERSION}/initramfs.img"
+/usr/bin/dracut --no-hostonly --kver "${KERNEL_VERSION}" --reproducible -v -f "/usr/lib/modules/${KERNEL_VERSION}/initramfs.img"
+chmod 0600 "/usr/lib/modules/${KERNEL_VERSION}/initramfs.img"
 
 echo "::endgroup::"
diff --git a/system_files/shared/usr/lib/dracut/dracut.conf.d/30-aurora-bootc-ostree-backend.conf b/system_files/shared/usr/lib/dracut/dracut.conf.d/30-aurora-bootc-ostree-backend.conf
new file mode 100644
index 00000000..486b2a08
--- /dev/null
+++ b/system_files/shared/usr/lib/dracut/dracut.conf.d/30-aurora-bootc-ostree-backend.conf
@@ -0,0 +1 @@
+add_dracutmodules+=" ostree "
diff --git a/system_files/shared/usr/lib/dracut/dracut.conf.d/90-ublue-luks.conf b/system_files/shared/usr/lib/dracut/dracut.conf.d/90-ublue-luks.conf
new file mode 100644
index 00000000..c1666eab
--- /dev/null
+++ b/system_files/shared/usr/lib/dracut/dracut.conf.d/90-ublue-luks.conf
@@ -0,0 +1 @@
+add_dracutmodules+=" fido2 tpm2-tss pkcs11 pcsc "