Defering module loading for fglrx and nvidia to a later point in time within xserver...

diff --git a/scripts/config/1150-xserver-xorg b/scripts/config/1150-xserver-xorg
index f805dad..fa82aa0 100755 (executable)
--- a/scripts/config/1150-xserver-xorg
+++ b/scripts/config/1150-xserver-xorg
@@ -122,8 +122,6 @@ Configure_xserver_xorg ()
                                        if grep -qs "${_DEVICE}" /usr/share/fglrx/fglrx.ids
                                        then
                                                LIVE_XORG_DRIVER="fglrx"
-
-                                               modprobe fglrx
                                        fi
                                fi
 
@@ -147,9 +145,6 @@ Configure_xserver_xorg ()
                                        if [ -n "${_NVIDIA_VERSION}" ]
                                        then
                                                LIVE_XORG_DRIVER="nvidia"
-
-                                               update-alternatives --quiet --set nvidia /usr/lib/nvidia/${_NVIDIA_VERSION}
-                                               modprobe --ignore-install ${_NVIDIA_MODULE}
                                        fi
                                fi
                        fi
@@ -184,6 +179,8 @@ EOF
                                then
                                        update-alternatives --quiet --set glx /usr/lib/fglrx
                                fi
+
+                               modprobe fglrx
                                ;;
 
                        nvidia)
@@ -192,6 +189,13 @@ EOF
                                then
                                        update-alternatives --quiet --set glx /usr/lib/nvidia
                                fi
+
+                               if [ -e /etc/alternatives/nvidia ]
+                               then
+                                       update-alternatives --quiet --set nvidia /usr/lib/nvidia/${_NVIDIA_VERSION:-current}
+                               fi
+
+                               modprobe --ignore-install ${_NVIDIA_MODULE:-nvidia}
                                ;;
 
                        *)