From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Thu, 21 Nov 2024 14:27:43 +0000 (+0100)
Subject: mkosi-initrd: Include extra modules
X-Git-Tag: v25~154
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6a1f166e58e5af337d47e6cae4502c72410d9972;p=thirdparty%2Fmkosi.git

mkosi-initrd: Include extra modules

These are all modules that the kernel tries to load while in the
initrd on my laptop. All of these seem generic enough to include by
default.
---

diff --git a/mkosi/resources/mkosi-initrd/mkosi.conf b/mkosi/resources/mkosi-initrd/mkosi.conf
index 31f1b6e41..1f3c27547 100644
--- a/mkosi/resources/mkosi-initrd/mkosi.conf
+++ b/mkosi/resources/mkosi-initrd/mkosi.conf
@@ -45,6 +45,8 @@ KernelModulesInclude=
                     /autofs4.ko
                     /binfmt_misc.ko
                     /btrfs.ko
+                    /cdrom.ko
+                    /cfg80211.ko
                     /configfs.ko
                     /dm-crypt.ko
                     /dm-integrity.ko
@@ -53,18 +55,31 @@ KernelModulesInclude=
                     /dm-raid.ko
                     /dm-verity.ko
                     /dmi-sysfs.ko
+                    /drm_buddy.ko
                     /efi-pstore.ko
                     /efivarfs.ko
                     /erofs.ko
                     /ext4.ko
+                    /i2c-algo-bit.ko
+                    /i2c-mux.ko
+                    /i2c-smbus.ko
+                    /intel_vsec.ko
+                    /kvm.ko
+                    /libphy.ko
                     /loop.ko
+                    /mdio_devres.ko
+                    /mei.ko
                     /nvme.ko
                     /overlay.ko
+                    /pmt_telemetry.ko
                     /qemu_fw_cfg.ko
                     /raid[0-9]*.ko
                     /scsi_mod.ko
                     /sd_mod.ko
+                    /serio.ko
                     /sg.ko
+                    /snd-intel-dspcfg.ko
+                    /snd-soc-hda-codec.ko
                     /squashfs.ko
                     /vfat.ko
                     /virtio_balloon.ko
@@ -78,7 +93,9 @@ KernelModulesInclude=
                     /virtiofs.ko
                     /vmw_vsock_virtio_transport.ko
                     /vsock.ko
+                    /wmi.ko
                     /x_tables.ko
                     /xfs.ko
+                    /xhci-pci-renesas.ko
                     ^fs/nls/
                     crypto/
diff --git a/tests/test_initrd.py b/tests/test_initrd.py
index 0a2784c26..7865295d2 100644
--- a/tests/test_initrd.py
+++ b/tests/test_initrd.py
@@ -223,11 +223,11 @@ def test_initrd_size(config: ImageConfig) -> None:
 
         # The fallback value is for CentOS and related distributions.
         maxsize = 1024**2 * {
-            Distribution.fedora: 59,
-            Distribution.debian: 58,
-            Distribution.ubuntu: 54,
-            Distribution.arch: 80,
-            Distribution.opensuse: 62,
-        }.get(config.distribution, 55)
+            Distribution.fedora: 61,
+            Distribution.debian: 60,
+            Distribution.ubuntu: 55,
+            Distribution.arch: 81,
+            Distribution.opensuse: 63,
+        }.get(config.distribution, 56)
 
         assert (Path(image.output_dir) / "image.initrd").stat().st_size <= maxsize