Skip to content

Commit aba4224

Browse files
committed
[ubuntu24.04] use KERNEL_MODULE_TYPE envar in place of OPEN_KERNEL_MODULES_ENABLED
Signed-off-by: Tariq Ibrahim <[email protected]>
1 parent f7b59de commit aba4224

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

ubuntu24.04/nvidia-driver

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,7 @@ NVIDIA_UVM_MODULE_PARAMS=()
1515
NVIDIA_MODESET_MODULE_PARAMS=()
1616
NVIDIA_PEERMEM_MODULE_PARAMS=()
1717
TARGETARCH=${TARGETARCH:?"Missing TARGETARCH env"}
18-
19-
OPEN_KERNEL_MODULES_ENABLED=${OPEN_KERNEL_MODULES_ENABLED:-false}
20-
[[ "${OPEN_KERNEL_MODULES_ENABLED}" == "true" ]] && KERNEL_TYPE=kernel-open || KERNEL_TYPE=kernel
18+
KERNEL_MODULE_TYPE=${KERNEL_MODULE_TYPE:-auto}
2119

2220
export DEBIAN_FRONTEND=noninteractive
2321

@@ -359,6 +357,12 @@ _install_driver() {
359357
install_args+=("--concurrency-level=${MAX_THREADS}")
360358
fi
361359

360+
if [[ "${KERNEL_MODULE_TYPE}" == "open" || "${KERNEL_MODULE_TYPE}" == "proprietary" ]]; then
361+
[[ "${KERNEL_MODULE_TYPE}" == "open" ]] && kernel_type=kernel-open || kernel_type=kernel
362+
echo "Proceeding with user-specified kernel module type ${KERNEL_MODULE_TYPE}"
363+
install_args+=("-m=${kernel_type}")
364+
fi
365+
362366
# Install the NVIDIA driver in one step
363367
sh NVIDIA-Linux-$DRIVER_ARCH-$DRIVER_VERSION.run --silent \
364368
--ui=none \
@@ -374,7 +378,6 @@ _install_driver() {
374378
--x-module-path=/tmp/null \
375379
--x-library-path=/tmp/null \
376380
--x-sysconfig-path=/tmp/null \
377-
-m="${KERNEL_TYPE}" \
378381
${install_args[@]+"${install_args[@]}"}
379382
}
380383

0 commit comments

Comments
 (0)