From 70395410d60606dc9e3652f9c8b0148ebc5c956c Mon Sep 17 00:00:00 2001
From: Lukas <lukas@phyllo.me>
Date: Thu, 19 Aug 2021 10:19:00 +0200
Subject: [PATCH] Let bhamd.cfg and bhimd.cfg take care of loading kernel
 modules

---
 leaves/{bamd.cfg => bhamd.cfg} | 10 ++++++++++
 leaves/{bimd.cfg => bhimd.cfg} |  9 ++++++++-
 leaves/bhmd.cfg                |  7 -------
 3 files changed, 18 insertions(+), 8 deletions(-)
 rename leaves/{bamd.cfg => bhamd.cfg} (60%)
 rename leaves/{bimd.cfg => bhimd.cfg} (70%)

diff --git a/leaves/bamd.cfg b/leaves/bhamd.cfg
similarity index 60%
rename from leaves/bamd.cfg
rename to leaves/bhamd.cfg
index efd0088..56d354d 100644
--- a/leaves/bamd.cfg
+++ b/leaves/bhamd.cfg
@@ -11,6 +11,16 @@
 %post # Beginning of %post section
 
 sed -i 's/\(quiet\)/\1 amd_iommu=on amd_iommu=pt rd.driver.pre=vfio-pci/i' /etc/default/grub # Load kernel modules in grub. 
+
+# Load kernel modules by adding vfio, vfio_pci, vfio_iommu_type1, vfio_virqfd
+echo "vfio" > /etc/modules-load.d/vfio.conf
+echo "vfio-pci" > /etc/modules-load.d/vfio-pci.conf
+echo "vfio_iommu_type1" > /etc/modules-load.d/vfio_iommu_type1.conf
+echo "vfio_virqfd" > /etc/modules-load.d/vfio_virqfd.conf
+
+dracut --add-drivers " vfio vfio-pci vfio_iommu_type1 vfio_virqfd " --force # Instruct dracut to load the vfio drivers
+dracut --force # Regenerate initramfs
+
 dracut --force # Regenerate initramfs.
 grub2-mkconfig -o /boot/grub2/grub.cfg # Update grub
 
diff --git a/leaves/bimd.cfg b/leaves/bhimd.cfg
similarity index 70%
rename from leaves/bimd.cfg
rename to leaves/bhimd.cfg
index 87ecc21..d2c0b89 100644
--- a/leaves/bimd.cfg
+++ b/leaves/bhimd.cfg
@@ -11,11 +11,18 @@
 %post # Beginning of %post section
 
 sed -i 's/\(quiet\)/\1 intel_iommu=on iommu=pt rd.driver.pre=vfio-pci i915.enable_gvt=1/i' /etc/default/grub # Load kernel modules in grub.
+
+# Load kernel modules by adding vfio, vfio_pci, vfio_iommu_type1, vfio_virqfd
+echo "vfio" > /etc/modules-load.d/vfio.conf
+echo "vfio-pci" > /etc/modules-load.d/vfio-pci.conf
+echo "vfio_iommu_type1" > /etc/modules-load.d/vfio_iommu_type1.conf
+echo "vfio_virqfd" > /etc/modules-load.d/vfio_virqfd.conf
 echo "kvmgt" > /etc/modules-load.d/kvmgt.conf # Load specific kernel modules kvmgt and vfio-mdev, for Intel (tm) GVT-g and Nvidia (tm)
 echo "vfio-mdev" > /etc/modules-load.d/vfio-mdev.conf # Load specific kernel modules kvmgt and vfio-mdev, for Intel (tm) GVT-g and Nvidia (tm)
 
-dracut --add-drivers "vfio-mdev kvmgt" --force # Instruct dracut to load the vfio drivers:
+dracut --add-drivers " vfio vfio-pci vfio_iommu_type1 vfio_virqfd vfio-mdev kvmgt " --force # Instruct dracut to load the vfio drivers
 dracut --force # Regenerate initramfs
+
 grub2-mkconfig -o /boot/grub2/grub.cfg # Update grub
 
 %end # End of the %post section
\ No newline at end of file
diff --git a/leaves/bhmd.cfg b/leaves/bhmd.cfg
index 456b5ea..7fe70e5 100644
--- a/leaves/bhmd.cfg
+++ b/leaves/bhmd.cfg
@@ -24,13 +24,6 @@ guestfs-tools # Complementary tools useful for interacting with vith guest syste
 
 %post # Beginning of %post section
 
-# Load kernel modules by adding vfio, vfio_pci, vfio_iommu_type1, vfio_virqfd
-echo "vfio" > /etc/modules-load.d/vfio.conf
-echo "vfio-pci" > /etc/modules-load.d/vfio-pci.conf
-echo "vfio_iommu_type1" > /etc/modules-load.d/vfio_iommu_type1.conf
-echo "vfio_virqfd" > /etc/modules-load.d/vfio_virqfd.conf
-
-dracut --add-drivers " vfio vfio-pci vfio_iommu_type1 vfio_virqfd " --force # Instruct dracut to load the vfio drivers
 mkdir /var/lib/libvirt/iso # Create a directory to store iso images
 # chown liveuser:liveuser /var/lib/libvirt/iso # Make the user "liveuser" the owner of this directory
 virsh pool-create-as --name iso --type dir --target /var/lib/libvirt/iso # Make libvirt aware of this new directory by creating a so-called 'pool'