Rename NVIDIA bootloader modes

iso/builder/config/bootloaders/grub-pc/grub.cfg

@@ -9,18 +9,18 @@ echo "  ███████╗██║  ██║███████║
 echo "  ╚══════╝╚═╝  ╚═╝╚══════╝   ╚═╝         ╚═════╝ ╚══════╝╚══════╝"
 echo ""
 
-menuentry "EASY-BEE (safe NVIDIA boot, default)" {
-    linux   @KERNEL_LIVE@ @APPEND_LIVE@ bee.nvidia.mode=safe
+menuentry "EASY-BEE" {
+    linux   @KERNEL_LIVE@ @APPEND_LIVE@ bee.nvidia.mode=normal
     initrd  @INITRD_LIVE@
 }
 
-menuentry "EASY-BEE (full NVIDIA / GSP)" {
-    linux   @KERNEL_LIVE@ @APPEND_LIVE@ bee.nvidia.mode=full
+menuentry "EASY-BEE (NVIDIA GSP=off)" {
+    linux   @KERNEL_LIVE@ @APPEND_LIVE@ bee.nvidia.mode=gsp-off
     initrd  @INITRD_LIVE@
 }
 
 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@
 }
 

iso/builder/config/bootloaders/isolinux/live.cfg.in

@@ -1,18 +1,18 @@
-label live-@FLAVOUR@-safe
-    menu label ^EASY-BEE (safe NVIDIA boot, default)
+label live-@FLAVOUR@-normal
+    menu label ^EASY-BEE
     menu default
     linux @LINUX@
     initrd @INITRD@
-    append @APPEND_LIVE@ bee.nvidia.mode=safe
+    append @APPEND_LIVE@ bee.nvidia.mode=normal
 
-label live-@FLAVOUR@-full
-    menu label ^EASY-BEE (full NVIDIA / GSP)
+label live-@FLAVOUR@-gsp-off
+    menu label EASY-BEE (^NVIDIA GSP=off)
     linux @LINUX@
     initrd @INITRD@
-    append @APPEND_LIVE@ bee.nvidia.mode=full
+    append @APPEND_LIVE@ bee.nvidia.mode=gsp-off
 
 label live-@FLAVOUR@-failsafe
     menu label EASY-BEE (^fail-safe)
     linux @LINUX@
     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

iso/builder/smoketest.sh

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

iso/overlay/usr/local/bin/bee-nvidia-load

@@ -37,7 +37,7 @@ cmdline_param() {
 
 nvidia_mode="$(cmdline_param bee.nvidia.mode || true)"
 if [ -z "$nvidia_mode" ]; then
-    nvidia_mode="safe"
+    nvidia_mode="normal"
 fi
 log "boot mode: $nvidia_mode"
 
@@ -60,21 +60,21 @@ load_module() {
 }
 
 case "$nvidia_mode" in
-    full)
+    normal|full)
         if ! load_module nvidia; then
             exit 1
         fi
         load_module nvidia-modeset || true
         load_module nvidia-uvm || true
         ;;
-    safe|*)
+    gsp-off|safe|*)
         # 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
         # conservative path for platforms where full boot-time GSP init is unstable.
         if ! load_module nvidia NVreg_EnableGpuFirmware=0; then
             exit 1
         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