From 0cfe1bf1894550e2cf8e99881e32bb4c1b160d98 Mon Sep 17 00:00:00 2001 From: kylerankin Date: Sat, 19 Sep 2026 00:14:52 +0000 Subject: [PATCH] fix: enable the btrfs kernel module in the OGC gaming-flavor kernel The gaming flavors (utah-gaming, utah-nvidia-gaming) fail the Post-Testing E2E LUKS install: the installer's mkfs.btrfs succeeds, then the mount is refused with 'unknown filesystem type 'btrfs'', and /dev/btrfs-control is absent. The non-gaming flavors install fine in the same run, so this is specific to the OGC kernel the gaming flavors ship. That kernel is a source build whose arch/x86/configs/x86_64_defconfig (OpenGamingCollective/linux) enables ext4, squashfs, erofs, iso9660 and nfs but CONFIG_BTRFS_FS -- so the built kernel carries no btrfs module and the live environment cannot mount the btrfs root the installer formats. Enable BTRFS_FS as a module beside squashfs/erofs in scripts/install-ogc-kernel.sh, and add it to required_config so the absence fails the build rather than surfacing at install time. Add a modprobe btrfs pre-check in iso/scripts/luks-e2e.sh before the installer runs, turning a repeat into a one-line diagnosis. Document the btrfs entry in the filesystem contract of docs/skills/kernel-cache.md. Signed-off-by: kylerankin --- docs/skills/kernel-cache.md | 16 ++++++++++++++-- iso/scripts/luks-e2e.sh | 14 ++++++++++++++ scripts/install-ogc-kernel.sh | 9 +++++---- 3 files changed, 33 insertions(+), 6 deletions(-) diff --git a/docs/skills/kernel-cache.md b/docs/skills/kernel-cache.md index b60233b11..2feeaba1d 100644 --- a/docs/skills/kernel-cache.md +++ b/docs/skills/kernel-cache.md @@ -90,8 +90,20 @@ The installer also exercises LUKS/device-mapper, while OSTree needs its filesystem support. `install-ogc-kernel.sh` enables these explicitly and checks the same `required_config` list after `olddefconfig`, after installation, and on cache extraction. Never omit a dracut module to work around a missing kernel -feature. Changes to this contract invalidate the cache through the existing -script hash and require a real kernel rebuild plus the ISO boot tests. +feature. + +The installer also needs btrfs: the LUKS ISO test formats and mounts the root +on `btrfs`, and the OGC kernel's `x86_64_defconfig` omits `CONFIG_BTRFS_FS`, so +the gaming flavors' live kernel had no btrfs module -- `mkfs.btrfs` succeeded +and the mount then failed with `unknown filesystem type 'btrfs'`, the same +missing `/dev/btrfs-control` as a bare module, which looked like a bad +filesystem at install time. `install-ogc-kernel.sh` enables `BTRFS_FS` as a +module beside SquashFS/EROFS and asserts it in `required_config`, so the +absence fails the build rather than the install. `iso/scripts/luks-e2e.sh` +adds a `modprobe btrfs` pre-check before the installer runs, turning a repeat +into a one-line diagnosis. Changes to this contract invalidate the cache +through the existing script hash and require a real kernel rebuild plus the ISO +boot tests. The contract also covers the display. `x86_64_defconfig` enables DRM and the Intel i915 driver and nothing else, so on any other GPU, QEMU's included, the diff --git a/iso/scripts/luks-e2e.sh b/iso/scripts/luks-e2e.sh index 455a58637..e946409e4 100755 --- a/iso/scripts/luks-e2e.sh +++ b/iso/scripts/luks-e2e.sh @@ -311,6 +311,20 @@ cat > "${WORK}/recipe.json" <