nvidiactl: Fix test condition, replace existing device nodes and fix shellcheck warning #602
+14
−8
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
`N` is the result of an arithmetic expansion, so it is never empty, and
`[ ! -z $N ]` is always true. Even with zero counted controllers,
/dev/nvidiactl is created and nvidia-uvm, nvidia-modeset and nvidia-drm
are loaded:
$ N=$(( 0 + 0 )); if [ ! -z $N ]; then echo "taken, N=$N"; fi
taken, N=0
Test for a positive count instead.
Assisted-by: claude-opus-5.5 (Claude Code)
`mknod` fails if the node already exists, for example when the service
is restarted:
mknod: /dev/nvidiactl: File exists
Add the helper `make_chardev`, which removes an existing node before
creating it. Recreating it, instead of skipping it, also makes sure
the node has the current major number, which is assigned dynamically
for nvidia-uvm.
Assisted-by: claude-opus-5.5 (Claude Code)
The variable `nvver` first holds the PCI ID of the first NVIDIA card,
and is later reused for the driver version. Store the PCI ID in
`pciid` instead.
Also, fill the array with `mapfile` instead of word splitting, which
shellcheck warns about:
In nvidiactl/nvidiactl line 29:
nvidiacards=( $(lspci -n | grep " 030[0,2]: 10de:" | cut -d ' ' -f 3) )
^-- SC2207 (warning): Prefer mapfile or read -a to split command output (or quote to avoid splitting).
While at it, quote the variable in the emptiness test.
Assisted-by: claude-opus-5.5 (Claude Code)
Sign in
to join this conversation on GitHub.
1 participant
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.