From f3644eb7ca00110561d1a5d686f68597869e689d Mon Sep 17 00:00:00 2001
From: thomas <kreitler@molgen.mpg.de>
Date: Wed, 21 Feb 2018 13:24:55 +0100
Subject: [PATCH 1/2] nvidiactl: More consistant command substitution

---
 nvidiactl/nvidiactl | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/nvidiactl/nvidiactl b/nvidiactl/nvidiactl
index e7018b9..b0aebfb 100755
--- a/nvidiactl/nvidiactl
+++ b/nvidiactl/nvidiactl
@@ -55,13 +55,13 @@ test -e /lib/modules/$kver/kernel/drivers/gpu/drm/drm_kms_helper.ko && modprobe
 insmod ${leglink}/nvidia.ko
 
 # Count the number of NVIDIA controllers found.
-NVDEVS=`lspci | grep -i NVIDIA`
-N3D=`echo "$NVDEVS" | grep "3D controller" | wc -l`
-NVGA=`echo "$NVDEVS" | grep "VGA compatible controller" | wc -l`
+NVDEVS=$(lspci | grep -i NVIDIA)
+N3D=$(echo "$NVDEVS" | grep "3D controller" | wc -l)
+NVGA=$(echo "$NVDEVS" | grep "VGA compatible controller" | wc -l)
 N=$(( $N3D + $NVGA ))
 if [ ! -z $N ]; then
   N=$(( $N - 1 ))
-  for i in `seq 0 $N`; do
+  for i in $(seq 0 $N); do
    mknod -m 666 /dev/nvidia$i c 195 $i
   done
   mknod -m 666 /dev/nvidiactl c 195 255
@@ -69,7 +69,7 @@ if [ ! -z $N ]; then
   # CUDA
   if [ -e ${leglink}/nvidia-uvm.ko ]; then
     insmod ${leglink}/nvidia-uvm.ko
-    D=`grep nvidia-uvm /proc/devices | awk '{print $1}'`
+    D=$(grep nvidia-uvm /proc/devices | awk '{print $1}')
     if [ ! -z $D ]; then
       mknod -m 666 /dev/nvidia-uvm c $D 0
     fi

From 11a4b92fd1004d9ba8193e6bc7e90ae5903ced14 Mon Sep 17 00:00:00 2001
From: thomas <kreitler@molgen.mpg.de>
Date: Wed, 21 Feb 2018 13:48:30 +0100
Subject: [PATCH 2/2] nvidiactl: Rename leglink to nvlink

Rationale:
- code is better to read (esp. at the end)
- we want to get rid of the legacy drivers
---
 nvidiactl/nvidiactl | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/nvidiactl/nvidiactl b/nvidiactl/nvidiactl
index b0aebfb..2ea5265 100755
--- a/nvidiactl/nvidiactl
+++ b/nvidiactl/nvidiactl
@@ -28,19 +28,19 @@ for leglvlhint in ${pciids} ; do
     fi
 done
 
-leglink=/usr/share/nvidia/kernel/${kver}/${leglvl}
+nvlink=/usr/share/nvidia/kernel/${kver}/${leglvl}
 
-if [ ! -h ${leglink} ] ; then
-    echo >&2 "WARNING: ${leglink} is not a link (to nvversion) trying current.."
-    leglink=/usr/share/nvidia/kernel/${kver}/current
+if [ ! -h ${nvlink} ] ; then
+    echo >&2 "WARNING: ${nvlink} is not a link (to nvversion) trying current.."
+    nvlink=/usr/share/nvidia/kernel/${kver}/current
 fi
 
-if [ ! -h ${leglink} ] ; then
-    echo >&2 "WARNING: ${leglink} is not a link (to nvversion) .."
+if [ ! -h ${nvlink} ] ; then
+    echo >&2 "WARNING: ${nvlink} is not a link (to nvversion) .."
     exit 1
 fi
 
-nvver=$(readlink ${leglink})
+nvver=$(readlink ${nvlink})
 
 #echo "kver=${kver} leglvl=${leglvl} nvver=${nvver}"
 
@@ -52,7 +52,7 @@ ln -sf /usr/share/nvidia/${nvver} /node/usr_share_mxgfx
 test -e /lib/modules/$kver/kernel/drivers/gpu/drm/drm.ko && modprobe drm
 test -e /lib/modules/$kver/kernel/drivers/gpu/drm/drm_kms_helper.ko && modprobe drm_kms_helper
 
-insmod ${leglink}/nvidia.ko
+insmod ${nvlink}/nvidia.ko
 
 # Count the number of NVIDIA controllers found.
 NVDEVS=$(lspci | grep -i NVIDIA)
@@ -67,14 +67,14 @@ if [ ! -z $N ]; then
   mknod -m 666 /dev/nvidiactl c 195 255
 
   # CUDA
-  if [ -e ${leglink}/nvidia-uvm.ko ]; then
-    insmod ${leglink}/nvidia-uvm.ko
+  if [ -e ${nvlink}/nvidia-uvm.ko ]; then
+    insmod ${nvlink}/nvidia-uvm.ko
     D=$(grep nvidia-uvm /proc/devices | awk '{print $1}')
     if [ ! -z $D ]; then
       mknod -m 666 /dev/nvidia-uvm c $D 0
     fi
   fi
-  test -e  ${leglink}/nvidia-modeset.ko && insmod ${leglink}/nvidia-modeset.ko
-  test -e  ${leglink}/nvidia-drm.ko && insmod ${leglink}/nvidia-drm.ko
+  test -e  ${nvlink}/nvidia-modeset.ko && insmod ${nvlink}/nvidia-modeset.ko
+  test -e  ${nvlink}/nvidia-drm.ko && insmod ${nvlink}/nvidia-drm.ko
 fi
 exit 0