Skip to content

Commit a7c51cb

Browse files
Change function names for readability
Signed-off-by: Karthik Vetrivel <kvetrivel@nvidia.com>
1 parent 82123af commit a7c51cb

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

rhel9/common.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ _gdrcopy_enabled() {
4848

4949
# Check if fast path should be used (driver already loaded with matching config)
5050
# Compares current digest from DRIVER_CONFIG_DIGEST env var with stored digest
51-
_should_use_fast_path() {
51+
_should_skip_kernel_module_reload() {
5252
[ -f /sys/module/nvidia/refcnt ] && [ -f /run/nvidia/nvidia-driver.state ] || return 1
5353
local current_digest="${DRIVER_CONFIG_DIGEST:-}"
5454
[ -z "${current_digest}" ] && return 1

rhel9/nvidia-driver

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -752,7 +752,7 @@ _wait_for_signal() {
752752
exit 0
753753
}
754754

755-
_userspace_only_install() {
755+
_userspace_install() {
756756
echo "The NVIDIA driver is already loaded with the desired configuration, performing userspace-only install"
757757
_unmount_rootfs
758758
_mount_rootfs
@@ -825,8 +825,8 @@ _load() {
825825
init() {
826826
_prepare_exclusive
827827

828-
if _should_use_fast_path; then
829-
_userspace_only_install
828+
if _should_skip_kernel_module_reload; then
829+
_userspace_install
830830
_wait_for_signal
831831
fi
832832

rhel9/ocp_dtk_entrypoint

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ nv-ctr-run-with-dtk() {
1818
exec bash -x nvidia-driver init
1919
fi
2020

21-
if _should_use_fast_path; then
21+
if _should_skip_kernel_module_reload; then
2222
echo "The NVIDIA driver is already loaded with the desired configuration, skipping kernel module build and proceeding with userspace-only install"
2323
exec bash -x nvidia-driver init
2424
fi
@@ -90,7 +90,7 @@ dtk-build-driver() {
9090
fi
9191

9292
# Check if fast path is being used - if so, skip building and signal completion
93-
if _should_use_fast_path; then
93+
if _should_skip_kernel_module_reload; then
9494
echo "The NVIDIA driver is already loaded with the desired configuration, skipping build"
9595
echo "Signaling driver_built to the main container and sleeping forever..."
9696
touch "$DRIVER_TOOLKIT_SHARED_DIR/driver_build_started"

ubuntu22.04/nvidia-driver

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -687,7 +687,7 @@ _get_current_digest() {
687687

688688
# Check if fast path should be used (driver already loaded with matching config)
689689
# Compares current digest from DRIVER_CONFIG_DIGEST env var with stored digest
690-
_should_use_fast_path() {
690+
_should_skip_kernel_module_reload() {
691691
[ -f /sys/module/nvidia/refcnt ] && [ -f /run/nvidia/nvidia-driver.state ] || return 1
692692
local current_digest="${DRIVER_CONFIG_DIGEST:-}"
693693
[ -z "${current_digest}" ] && return 1
@@ -756,7 +756,7 @@ init() {
756756
trap "echo 'Caught signal'; exit 1" HUP INT QUIT PIPE TERM
757757
trap "_shutdown" EXIT
758758

759-
if _should_use_fast_path; then
759+
if _should_skip_kernel_module_reload; then
760760
echo "The NVIDIA driver is already loaded with the desired configuration, performing userspace-only install"
761761
_unmount_rootfs
762762
_install_userspace_components

0 commit comments

Comments
 (0)