reanimator/bee
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Rename NVIDIA bootloader modes

Browse Source
This commit is contained in:
Mikhail Chusavitin
2026-03-25 19:12:26 +03:00
parent 27d478aed6
commit 30cf014d58
4 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
iso/builder/config/bootloaders/grub-pc/grub.cfg
View File

@@ -9,18 +9,18 @@ echo " ███████╗██║ ██║███████║
echo " ╚══════╝╚═╝ ╚═╝╚══════╝ ╚═╝ ╚═════╝ ╚══════╝╚══════╝" echo " ╚══════╝╚═╝ ╚═╝╚══════╝ ╚═╝ ╚═════╝ ╚══════╝╚══════╝"
echo "" echo ""
menuentry "EASY-BEE (safe NVIDIA boot, default)" { menuentry "EASY-BEE" {
linux @KERNEL_LIVE@ @APPEND_LIVE@ bee.nvidia.mode=safe linux @KERNEL_LIVE@ @APPEND_LIVE@ bee.nvidia.mode=normal
initrd @INITRD_LIVE@ initrd @INITRD_LIVE@
} }
menuentry "EASY-BEE (full NVIDIA / GSP)" { menuentry "EASY-BEE (NVIDIA GSP=off)" {
linux @KERNEL_LIVE@ @APPEND_LIVE@ bee.nvidia.mode=full linux @KERNEL_LIVE@ @APPEND_LIVE@ bee.nvidia.mode=gsp-off
initrd @INITRD_LIVE@ initrd @INITRD_LIVE@
} }
menuentry "EASY-BEE (fail-safe)" { menuentry "EASY-BEE (fail-safe)" {
linux @KERNEL_LIVE@ @APPEND_LIVE@ bee.nvidia.mode=safe memtest noapic noapm nodma nomce nolapic nosmp vga=normal linux @KERNEL_LIVE@ @APPEND_LIVE@ bee.nvidia.mode=gsp-off memtest noapic noapm nodma nomce nolapic nosmp vga=normal
initrd @INITRD_LIVE@ initrd @INITRD_LIVE@
} }

14
iso/builder/config/bootloaders/isolinux/live.cfg.in
View File

@@ -1,18 +1,18 @@
label live-@FLAVOUR@-safe label live-@FLAVOUR@-normal
menu label ^EASY-BEE (safe NVIDIA boot, default) menu label ^EASY-BEE
menu default menu default
linux @LINUX@ linux @LINUX@
initrd @INITRD@ initrd @INITRD@
append @APPEND_LIVE@ bee.nvidia.mode=safe append @APPEND_LIVE@ bee.nvidia.mode=normal
label live-@FLAVOUR@-full label live-@FLAVOUR@-gsp-off
menu label ^EASY-BEE (full NVIDIA / GSP) menu label EASY-BEE (^NVIDIA GSP=off)
linux @LINUX@ linux @LINUX@
initrd @INITRD@ initrd @INITRD@
append @APPEND_LIVE@ bee.nvidia.mode=full append @APPEND_LIVE@ bee.nvidia.mode=gsp-off
label live-@FLAVOUR@-failsafe label live-@FLAVOUR@-failsafe
menu label EASY-BEE (^fail-safe) menu label EASY-BEE (^fail-safe)
linux @LINUX@ linux @LINUX@
initrd @INITRD@ initrd @INITRD@
append @APPEND_LIVE@ bee.nvidia.mode=safe memtest noapic noapm nodma nomce nolapic nosmp vga=normal append @APPEND_LIVE@ bee.nvidia.mode=gsp-off memtest noapic noapm nodma nomce nolapic nosmp vga=normal

12
iso/builder/smoketest.sh
View File

@@ -26,7 +26,7 @@ echo ""
KVER=$(uname -r) KVER=$(uname -r)
info "kernel: $KVER" info "kernel: $KVER"
NVIDIA_BOOT_MODE="safe" NVIDIA_BOOT_MODE="normal"
for arg in $(cat /proc/cmdline 2>/dev/null); do for arg in $(cat /proc/cmdline 2>/dev/null); do
case "$arg" in case "$arg" in
bee.nvidia.mode=*) bee.nvidia.mode=*)
@@ -71,10 +71,10 @@ fi
for mod in nvidia_modeset nvidia_uvm; do for mod in nvidia_modeset nvidia_uvm; do
if /sbin/lsmod 2>/dev/null | grep -q "^$mod "; then if /sbin/lsmod 2>/dev/null | grep -q "^$mod "; then
ok "module loaded: $mod" ok "module loaded: $mod"
elif [ "${NVIDIA_BOOT_MODE}" = "full" ]; then elif [ "${NVIDIA_BOOT_MODE}" = "normal" ] || [ "${NVIDIA_BOOT_MODE}" = "full" ]; then
fail "module NOT loaded in full mode: $mod" fail "module NOT loaded in normal mode: $mod"
else else
warn "module not loaded in safe mode: $mod" warn "module not loaded in GSP-off mode: $mod"
fi fi
done done
@@ -90,8 +90,8 @@ done
if [ -e /dev/nvidia-uvm ]; then if [ -e /dev/nvidia-uvm ]; then
ok "/dev/nvidia-uvm exists" ok "/dev/nvidia-uvm exists"
elif [ "${NVIDIA_BOOT_MODE}" = "full" ]; then elif [ "${NVIDIA_BOOT_MODE}" = "normal" ] || [ "${NVIDIA_BOOT_MODE}" = "full" ]; then
fail "/dev/nvidia-uvm missing in full mode" fail "/dev/nvidia-uvm missing in normal mode"
else else
warn "/dev/nvidia-uvm missing — CUDA stress path may be unavailable until loaded on demand" warn "/dev/nvidia-uvm missing — CUDA stress path may be unavailable until loaded on demand"
fi fi

8
iso/overlay/usr/local/bin/bee-nvidia-load
View File

@@ -37,7 +37,7 @@ cmdline_param() {
nvidia_mode="$(cmdline_param bee.nvidia.mode || true)" nvidia_mode="$(cmdline_param bee.nvidia.mode || true)"
if [ -z "$nvidia_mode" ]; then if [ -z "$nvidia_mode" ]; then
nvidia_mode="safe" nvidia_mode="normal"
fi fi
log "boot mode: $nvidia_mode" log "boot mode: $nvidia_mode"
@@ -60,21 +60,21 @@ load_module() {
} }
case "$nvidia_mode" in case "$nvidia_mode" in
full) normal|full)
if ! load_module nvidia; then if ! load_module nvidia; then
exit 1 exit 1
fi fi
load_module nvidia-modeset || true load_module nvidia-modeset || true
load_module nvidia-uvm || true load_module nvidia-uvm || true
;; ;;
safe|*) gsp-off|safe|*)
# NVIDIA documents that GSP firmware is enabled by default on newer GPUs and can # NVIDIA documents that GSP firmware is enabled by default on newer GPUs and can
# be disabled via NVreg_EnableGpuFirmware=0. Safe mode keeps the live ISO on the # be disabled via NVreg_EnableGpuFirmware=0. Safe mode keeps the live ISO on the
# conservative path for platforms where full boot-time GSP init is unstable. # conservative path for platforms where full boot-time GSP init is unstable.
if ! load_module nvidia NVreg_EnableGpuFirmware=0; then if ! load_module nvidia NVreg_EnableGpuFirmware=0; then
exit 1 exit 1
fi fi
log "safe mode: skipping nvidia-modeset and nvidia-uvm during boot" log "GSP-off mode: skipping nvidia-modeset and nvidia-uvm during boot"
;; ;;
esac esac