From 9b5d4e303693312ed866ad2486f09c5d252a1cf8 Mon Sep 17 00:00:00 2001 From: Michael Chus Date: Wed, 29 Jul 2026 14:23:25 +0300 Subject: [PATCH] build(iso): redefine no-GUI and fail-safe boot entries MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit no-GUI is now just the normal entry minus the GUI: bee.gui=off with bee.nvidia.mode=normal (drops the previous gsp-off/pci=realloc it had picked up). fail-safe is now simply the GPU/PCIe-workaround boot — bee.nvidia.mode=gsp-off pci=realloc iommu=pt over the standard base — instead of the old noapic/nodma/nomce/nolapic/nosmp minimal mode, so it can actually run GPU tests (nvbandwidth) to verify the iommu=pt half of the vendor fix. Applied identically across all four sources (grub.cfg + live.cfg.in templates and build.sh write_canonical_* generators). Co-Authored-By: Claude Opus 4.8 --- iso/builder/build.sh | 18 +++++++++--------- .../config/bootloaders/grub-efi/grub.cfg | 8 ++++---- .../config/bootloaders/isolinux/live.cfg.in | 10 +++++----- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/iso/builder/build.sh b/iso/builder/build.sh index ed56c41..a8243cd 100755 --- a/iso/builder/build.sh +++ b/iso/builder/build.sh @@ -788,13 +788,13 @@ menuentry "EASY-BEE v${version_label} -- load to RAM (toram)" { initrd ${initrd} } -menuentry "EASY-BEE v${version_label} -- no GUI / troubleshooting (gsp-off, pci=realloc)" { - linux ${kernel} ${append_live} nomodeset bee.gui=off bee.nvidia.mode=gsp-off pci=realloc net.ifnames=0 biosdevname=0 mitigations=off transparent_hugepage=always numa_balancing=disable pcie_aspm=off intel_idle.max_cstate=1 processor.max_cstate=1 nowatchdog nosoftlockup +menuentry "EASY-BEE v${version_label} -- no GUI / no X11" { + linux ${kernel} ${append_live} nomodeset bee.gui=off bee.nvidia.mode=normal net.ifnames=0 biosdevname=0 mitigations=off transparent_hugepage=always numa_balancing=disable pcie_aspm=off intel_idle.max_cstate=1 processor.max_cstate=1 nowatchdog nosoftlockup initrd ${initrd} } -menuentry "EASY-BEE v${version_label} -- fail-safe (iommu=pt)" { - linux ${kernel} ${append_live} nomodeset bee.nvidia.mode=gsp-off noapic noapm nodma nomce nolapic nosmp vga=normal iommu=pt net.ifnames=0 biosdevname=0 +menuentry "EASY-BEE v${version_label} -- fail-safe (gsp-off, pci=realloc, iommu=pt)" { + linux ${kernel} ${append_live} nomodeset bee.nvidia.mode=gsp-off pci=realloc iommu=pt net.ifnames=0 biosdevname=0 mitigations=off transparent_hugepage=always numa_balancing=disable pcie_aspm=off intel_idle.max_cstate=1 processor.max_cstate=1 nowatchdog nosoftlockup initrd ${initrd} } @@ -842,17 +842,17 @@ label live-@FLAVOUR@-toram initrd ${initrd} append ${append_live} toram nomodeset bee.nvidia.mode=normal net.ifnames=0 biosdevname=0 mitigations=off transparent_hugepage=always numa_balancing=disable pcie_aspm=off intel_idle.max_cstate=1 processor.max_cstate=1 nowatchdog nosoftlockup -label live-@FLAVOUR@-troubleshooting - menu label EASY-BEE v${version_label} (^no GUI / troubleshooting: gsp-off, pci=realloc) +label live-@FLAVOUR@-console + menu label EASY-BEE v${version_label} (^no GUI / no X11) linux ${kernel} initrd ${initrd} - append ${append_live} nomodeset bee.gui=off bee.nvidia.mode=gsp-off pci=realloc net.ifnames=0 biosdevname=0 mitigations=off transparent_hugepage=always numa_balancing=disable pcie_aspm=off intel_idle.max_cstate=1 processor.max_cstate=1 nowatchdog nosoftlockup + append ${append_live} nomodeset bee.gui=off bee.nvidia.mode=normal net.ifnames=0 biosdevname=0 mitigations=off transparent_hugepage=always numa_balancing=disable pcie_aspm=off intel_idle.max_cstate=1 processor.max_cstate=1 nowatchdog nosoftlockup label live-@FLAVOUR@-failsafe - menu label EASY-BEE (^fail-safe, iommu=pt) + menu label EASY-BEE (^fail-safe: gsp-off, pci=realloc, iommu=pt) linux ${kernel} initrd ${initrd} - append ${append_live} nomodeset bee.nvidia.mode=gsp-off noapic noapm nodma nomce nolapic nosmp vga=normal iommu=pt net.ifnames=0 biosdevname=0 + append ${append_live} nomodeset bee.nvidia.mode=gsp-off pci=realloc iommu=pt net.ifnames=0 biosdevname=0 mitigations=off transparent_hugepage=always numa_balancing=disable pcie_aspm=off intel_idle.max_cstate=1 processor.max_cstate=1 nowatchdog nosoftlockup label wipe-disks menu label *** WIPE ALL DISKS (irreversible!) *** diff --git a/iso/builder/config/bootloaders/grub-efi/grub.cfg b/iso/builder/config/bootloaders/grub-efi/grub.cfg index 442de37..b678aaf 100644 --- a/iso/builder/config/bootloaders/grub-efi/grub.cfg +++ b/iso/builder/config/bootloaders/grub-efi/grub.cfg @@ -10,13 +10,13 @@ menuentry "EASY-BEE v@VERSION@ -- load to RAM (toram)" { initrd @INITRD_LIVE@ } -menuentry "EASY-BEE v@VERSION@ -- no GUI / troubleshooting (gsp-off, pci=realloc)" { - linux @KERNEL_LIVE@ @APPEND_LIVE@ nomodeset bee.gui=off bee.nvidia.mode=gsp-off pci=realloc net.ifnames=0 biosdevname=0 mitigations=off transparent_hugepage=always numa_balancing=disable pcie_aspm=off intel_idle.max_cstate=1 processor.max_cstate=1 nowatchdog nosoftlockup +menuentry "EASY-BEE v@VERSION@ -- no GUI / no X11" { + linux @KERNEL_LIVE@ @APPEND_LIVE@ nomodeset bee.gui=off bee.nvidia.mode=normal net.ifnames=0 biosdevname=0 mitigations=off transparent_hugepage=always numa_balancing=disable pcie_aspm=off intel_idle.max_cstate=1 processor.max_cstate=1 nowatchdog nosoftlockup initrd @INITRD_LIVE@ } -menuentry "EASY-BEE v@VERSION@ -- fail-safe (iommu=pt)" { - linux @KERNEL_LIVE@ @APPEND_LIVE@ nomodeset bee.nvidia.mode=gsp-off noapic noapm nodma nomce nolapic nosmp vga=normal iommu=pt net.ifnames=0 biosdevname=0 +menuentry "EASY-BEE v@VERSION@ -- fail-safe (gsp-off, pci=realloc, iommu=pt)" { + linux @KERNEL_LIVE@ @APPEND_LIVE@ nomodeset bee.nvidia.mode=gsp-off pci=realloc iommu=pt net.ifnames=0 biosdevname=0 mitigations=off transparent_hugepage=always numa_balancing=disable pcie_aspm=off intel_idle.max_cstate=1 processor.max_cstate=1 nowatchdog nosoftlockup initrd @INITRD_LIVE@ } diff --git a/iso/builder/config/bootloaders/isolinux/live.cfg.in b/iso/builder/config/bootloaders/isolinux/live.cfg.in index 5e6d176..6f2c1cc 100644 --- a/iso/builder/config/bootloaders/isolinux/live.cfg.in +++ b/iso/builder/config/bootloaders/isolinux/live.cfg.in @@ -11,17 +11,17 @@ label live-@FLAVOUR@-toram initrd @INITRD@ append @APPEND_LIVE@ toram nomodeset bee.nvidia.mode=normal net.ifnames=0 biosdevname=0 mitigations=off transparent_hugepage=always numa_balancing=disable pcie_aspm=off intel_idle.max_cstate=1 processor.max_cstate=1 nowatchdog nosoftlockup -label live-@FLAVOUR@-troubleshooting - menu label EASY-BEE v@VERSION@ (^no GUI / troubleshooting: gsp-off, pci=realloc) +label live-@FLAVOUR@-console + menu label EASY-BEE v@VERSION@ (^no GUI / no X11) linux @LINUX@ initrd @INITRD@ - append @APPEND_LIVE@ nomodeset bee.gui=off bee.nvidia.mode=gsp-off pci=realloc net.ifnames=0 biosdevname=0 mitigations=off transparent_hugepage=always numa_balancing=disable pcie_aspm=off intel_idle.max_cstate=1 processor.max_cstate=1 nowatchdog nosoftlockup + append @APPEND_LIVE@ nomodeset bee.gui=off bee.nvidia.mode=normal net.ifnames=0 biosdevname=0 mitigations=off transparent_hugepage=always numa_balancing=disable pcie_aspm=off intel_idle.max_cstate=1 processor.max_cstate=1 nowatchdog nosoftlockup label live-@FLAVOUR@-failsafe - menu label EASY-BEE (^fail-safe, iommu=pt) + menu label EASY-BEE (^fail-safe: gsp-off, pci=realloc, iommu=pt) linux @LINUX@ initrd @INITRD@ - append @APPEND_LIVE@ nomodeset bee.nvidia.mode=gsp-off noapic noapm nodma nomce nolapic nosmp vga=normal iommu=pt net.ifnames=0 biosdevname=0 + append @APPEND_LIVE@ nomodeset bee.nvidia.mode=gsp-off pci=realloc iommu=pt net.ifnames=0 biosdevname=0 mitigations=off transparent_hugepage=always numa_balancing=disable pcie_aspm=off intel_idle.max_cstate=1 processor.max_cstate=1 nowatchdog nosoftlockup label wipe-disks menu label *** WIPE ALL DISKS (irreversible!) ***