File U_prime-select.sh-bail-out-if-nvidia-xconfig-fa... of Package suse-prime

Overview Repositories Revisions Requests Users Attributes Meta

File U_prime-select.sh-bail-out-if-nvidia-xconfig-fails-use.patch of Package suse-prime (Revision 8eddd2269f711fb8ecc412baf7ec429d)

Currently displaying revision 8eddd2269f711fb8ecc412baf7ec429d , Show latest

From 8be917026263539230b470e2c05cc46955e618c4 Mon Sep 17 00:00:00 2001
From: Stefan Dirsch <sndirsch@suse.de>
Date: Fri, 11 Jan 2019 17:35:35 +0100
Subject: [PATCH] prime-select.sh: bail out if nvidia-xconfig fails; use PCI
 BusID of first NVIDIA GPU/card

'nvidia-xconfig --query-gpu-info' may easily fail due to missing NVIDIA
kernel modules or alike. Therefore bail out in this case with exit 1.

There could be more than one NVIDIA card/GPU in the system. Use the
first detected one for X configuration in that case.
---
 prime-select.sh | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/prime-select.sh b/prime-select.sh
index de51c2b..6613328 100755
--- a/prime-select.sh
+++ b/prime-select.sh
@@ -27,7 +27,13 @@ case $type in
       clean_files 
 
       gpu_info=`nvidia-xconfig --query-gpu-info`
-      nvidia_busid=`echo "$gpu_info" |grep -i "PCI BusID"|sed 's/PCI BusID ://'|sed 's/ //g'`
+      # This may easily fail, if no NVIDIA kernel module is available or alike
+      if [ $? -ne 0 ]; then
+         echo "PCI BusID of NVIDIA card could not be detected!"
+         exit 1
+      fi
+      # There could be more than on NVIDIA card/GPU; use the first one in that case
+      nvidia_busid=`echo "$gpu_info" |grep -i "PCI BusID"|head -n 1|sed 's/PCI BusID ://'|sed 's/ //g'`
       libglx_nvidia=`update-alternatives --list libglx.so|grep nvidia-libglx.so`
 
       update-alternatives --set libglx.so $libglx_nvidia
-- 
2.16.4

Places

File U_prime-select.sh-bail-out-if-nvidia-xconfig-fails-use.patch of Package suse-prime (Revision 8eddd2269f711fb8ecc412baf7ec429d)

Places