From f60aab1d2c8721c664afc8e15c9d202e7f41d1bd Mon Sep 17 00:00:00 2001 From: thomas Date: Thu, 22 Feb 2018 12:24:15 +0100 Subject: [PATCH] nvidiactl: Straighten indent --- nvidiactl/nvidiactl | 37 +++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/nvidiactl/nvidiactl b/nvidiactl/nvidiactl index da3ba6d..2d6f3f5 100755 --- a/nvidiactl/nvidiactl +++ b/nvidiactl/nvidiactl @@ -7,9 +7,9 @@ set_generic_mxgfx_link () { if [ -d /sys/module/nouveau ] ; then - echo >&2 "NOTE: nouveau driver loaded already, using 'mxgfx-generic'." - set_generic_mxgfx_link - exit 0 + echo >&2 "NOTE: nouveau driver loaded already, using 'mxgfx-generic'." + set_generic_mxgfx_link + exit 0 fi PCIIDHINT_DIR=/usr/share/nvidia/pciidhints @@ -21,31 +21,31 @@ nvidiacards=( $(lspci -n | grep " 0300: 10de:" | cut -d ' ' -f 3) ) nvver=${nvidiacards[0]} if [ -z ${nvver} ] ; then - echo >&2 "WARNING: no nvidia card found.." - set_generic_mxgfx_link - exit 0 + echo >&2 "WARNING: no nvidia card found.." + set_generic_mxgfx_link + exit 0 fi pciids="${PCIIDHINT_DIR}/${kver}-${nvver} ${PCIIDHINT_DIR}/${nvver}" for leglvlhint in ${pciids} ; do - if [ -h "${leglvlhint}" ] ; then - set_generic_mxgfx_link - test -e /lib/modules/${kver}/kernel/drivers/gpu/drm/nouveau/nouveau.ko && \ - echo >&2 "NOTE: legacy nvidia card found, loading nouveau .." && \ - modprobe nouveau && \ - exit 0 - - echo >&2 "ERROR: nouveau module not available, choose a newer kernel!" - exit 1 - fi + if [ -h "${leglvlhint}" ] ; then + set_generic_mxgfx_link + test -e /lib/modules/${kver}/kernel/drivers/gpu/drm/nouveau/nouveau.ko && \ + echo >&2 "NOTE: legacy nvidia card found, loading nouveau .." && \ + modprobe nouveau && \ + exit 0 + + echo >&2 "ERROR: nouveau module not available, choose a newer kernel!" + exit 1 + fi done nvlink=/usr/share/nvidia/kernel/${kver}/current if [ ! -h ${nvlink} ] ; then - echo >&2 "WARNING: ${nvlink} is not a link (to nvversion) .." - exit 1 + echo >&2 "WARNING: ${nvlink} is not a link (to nvversion) .." + exit 1 fi nvver=$(readlink ${nvlink}) @@ -85,4 +85,5 @@ if [ ! -z $N ]; then 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