From 708f14d3802314f49b30194577ba65d87fa34763 Mon Sep 17 00:00:00 2001
From: Sebastian Schmelzer
Date: Wed, 19 Nov 2008 16:00:29 +0000
Subject:  * don't use nvidia xorg driver, if we don't have the kernel module..

git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@2389 95ad53e4-c205-0410-b2fa-d234c58c8868
---
 os-plugins/plugins/xserver/XX_xserver.sh | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'os-plugins')

diff --git a/os-plugins/plugins/xserver/XX_xserver.sh b/os-plugins/plugins/xserver/XX_xserver.sh
index 4c9b8c5b..d26693ef 100644
--- a/os-plugins/plugins/xserver/XX_xserver.sh
+++ b/os-plugins/plugins/xserver/XX_xserver.sh
@@ -85,10 +85,16 @@ ${PLUGIN_ROOTFS}/usr/X11R6/lib/modules/\,"
       xmodule="nvidia"
       PLUGIN_PATH="/mnt${PLUGIN_ROOTFS}"
 
-      # sometimes the kernel module needs agpgart
-      modprobe agpgart
-      # insert kernel driver
-      chroot /mnt /sbin/insmod ${PLUGIN_ROOTFS}/modules/nvidia.ko
+      # if we can't find the nongpl kernel module, use gpl xorg
+      # nvidia driver
+      if [ -e ${PLUGIN_ROOTFS}/modules/nvidia.ko ]; then
+        # sometimes the kernel module needs agpgart
+        modprobe agpgart
+        # insert kernel driver
+        chroot /mnt /sbin/insmod ${PLUGIN_ROOTFS}/modules/nvidia.ko
+      else
+         xmodule="nv"
+      fi
 
     fi
 
-- 
cgit v1.2.3-55-g7522