Making module loading for fglrx and nvidia not fail.
authorDaniel Baumann <mail@daniel-baumann.ch>
Thu, 25 Apr 2013 17:37:05 +0000 (19:37 +0200)
committerDaniel Baumann <mail@daniel-baumann.ch>
Mon, 6 May 2013 18:33:22 +0000 (20:33 +0200)
It has been observed that on some weird systems,
the graphic card is supported by fglrx or nvidia
(by having its pci-id listed in the drivers own
pci-id list), yet the driver fails to initialize
the card (shown by a 'device is busy' message).

In such cases, we need to not error-out of live-config
and continue as normal, then, xorg takes care about this
automatically loads the next best suitable driver.

scripts/config/1140-xserver-xorg

index 7468073..4a9b8f3 100755 (executable)
@@ -182,14 +182,14 @@ EOF
                        fglrx)
                                update-alternatives --quiet --set glx /usr/lib/fglrx
 
-                               modprobe --ignore-install fglrx
+                               modprobe --ignore-install fglrx || true
                                ;;
 
                        nvidia)
                                update-alternatives --quiet --set glx /usr/lib/nvidia
                                update-alternatives --quiet --set nvidia /usr/lib/nvidia/${_NVIDIA_VERSION:-current}
 
-                               modprobe --ignore-install ${_NVIDIA_MODULE:-nvidia}
+                               modprobe --ignore-install ${_NVIDIA_MODULE:-nvidia} || true
                                ;;
 
                        *)