Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 5ee120158e |
@@ -417,9 +417,13 @@ if [ -f "${OVERLAY_STAGE_DIR}/etc/motd" ]; then
|
|||||||
mv "${OVERLAY_STAGE_DIR}/etc/motd.patched" "${OVERLAY_STAGE_DIR}/etc/motd"
|
mv "${OVERLAY_STAGE_DIR}/etc/motd.patched" "${OVERLAY_STAGE_DIR}/etc/motd"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# --- copy variant-specific package list into work dir ---
|
# --- copy variant-specific package list, remove all other variant lists ---
|
||||||
|
# live-build picks up ALL .list.chroot files — delete other variants to avoid conflicts.
|
||||||
cp "${BUILD_WORK_DIR}/config/package-lists/bee-${BEE_GPU_VENDOR}.list.chroot" \
|
cp "${BUILD_WORK_DIR}/config/package-lists/bee-${BEE_GPU_VENDOR}.list.chroot" \
|
||||||
"${BUILD_WORK_DIR}/config/package-lists/bee-gpu.list.chroot"
|
"${BUILD_WORK_DIR}/config/package-lists/bee-gpu.list.chroot"
|
||||||
|
rm -f "${BUILD_WORK_DIR}/config/package-lists/bee-nvidia.list.chroot" \
|
||||||
|
"${BUILD_WORK_DIR}/config/package-lists/bee-amd.list.chroot" \
|
||||||
|
"${BUILD_WORK_DIR}/config/package-lists/bee-nogpu.list.chroot"
|
||||||
|
|
||||||
# --- remove archives for the other vendor(s) ---
|
# --- remove archives for the other vendor(s) ---
|
||||||
if [ "$BEE_GPU_VENDOR" = "nvidia" ]; then
|
if [ "$BEE_GPU_VENDOR" = "nvidia" ]; then
|
||||||
|
|||||||
@@ -24,6 +24,11 @@ menuentry "EASY-BEE (NVIDIA GSP=off)" {
|
|||||||
initrd @INITRD_LIVE@
|
initrd @INITRD_LIVE@
|
||||||
}
|
}
|
||||||
|
|
||||||
|
menuentry "EASY-BEE (NVIDIA no MSI-X)" {
|
||||||
|
linux @KERNEL_LIVE@ @APPEND_LIVE@ nomodeset bee.nvidia.mode=nomsi net.ifnames=0 biosdevname=0 mitigations=off transparent_hugepage=always numa_balancing=disable nowatchdog nosoftlockup
|
||||||
|
initrd @INITRD_LIVE@
|
||||||
|
}
|
||||||
|
|
||||||
menuentry "EASY-BEE (fail-safe)" {
|
menuentry "EASY-BEE (fail-safe)" {
|
||||||
linux @KERNEL_LIVE@ @APPEND_LIVE@ bee.nvidia.mode=gsp-off memtest noapic noapm nodma nomce nolapic nosmp vga=normal net.ifnames=0 biosdevname=0
|
linux @KERNEL_LIVE@ @APPEND_LIVE@ bee.nvidia.mode=gsp-off memtest noapic noapm nodma nomce nolapic nosmp vga=normal net.ifnames=0 biosdevname=0
|
||||||
initrd @INITRD_LIVE@
|
initrd @INITRD_LIVE@
|
||||||
|
|||||||
@@ -67,7 +67,7 @@ case "$nvidia_mode" in
|
|||||||
load_module nvidia-modeset || true
|
load_module nvidia-modeset || true
|
||||||
load_module nvidia-uvm || true
|
load_module nvidia-uvm || true
|
||||||
;;
|
;;
|
||||||
gsp-off|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.
|
||||||
@@ -76,6 +76,15 @@ case "$nvidia_mode" in
|
|||||||
fi
|
fi
|
||||||
log "GSP-off mode: skipping nvidia-modeset and nvidia-uvm during boot"
|
log "GSP-off mode: skipping nvidia-modeset and nvidia-uvm during boot"
|
||||||
;;
|
;;
|
||||||
|
nomsi|*)
|
||||||
|
# nomsi: disable MSI-X/MSI interrupts — use when RmInitAdapter fails with
|
||||||
|
# "Failed to enable MSI-X" on one or more GPUs (IOMMU group interrupt limits).
|
||||||
|
# NVreg_EnableMSI=0 forces legacy INTx interrupts for all GPUs.
|
||||||
|
if ! load_module nvidia NVreg_EnableGpuFirmware=0 NVreg_EnableMSI=0; then
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
log "nomsi mode: MSI-X disabled (NVreg_EnableMSI=0), skipping nvidia-modeset and nvidia-uvm"
|
||||||
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
# Create /dev/nvidia* device nodes (udev rules absent since we use .run installer)
|
# Create /dev/nvidia* device nodes (udev rules absent since we use .run installer)
|
||||||
|
|||||||
Reference in New Issue
Block a user