From a7cb8de82c327d791cc67a03b21d15e42b221042 Mon Sep 17 00:00:00 2001
From: Bastian Wissler
Date: Tue, 2 Dec 2008 16:33:49 +0000
Subject: xserver plugin: * fixed some strange condition (that wasnt me...)

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

(limited to 'os-plugins')

diff --git a/os-plugins/plugins/xserver/XX_xserver.sh b/os-plugins/plugins/xserver/XX_xserver.sh
index d26693ef..5b2f3815 100644
--- a/os-plugins/plugins/xserver/XX_xserver.sh
+++ b/os-plugins/plugins/xserver/XX_xserver.sh
@@ -52,7 +52,7 @@ if [ -e /initramfs/plugin-conf/xserver.conf -a \
     ######################################################################
     set -x
 
-    if [ $(grep -i -m 1 'fglrx' \
+    if [ $(grep -i -m 1 'Module: fglrx' \
         /etc/hwinfo.data | wc -l) -ge "1"  -a $xserver_prefnongpl -eq 1 ]
     then
       # we have an ati card here
@@ -74,7 +74,7 @@ ${PLUGIN_ROOTFS}/usr/X11R6/lib/modules/\,"
           ln -s ${PLUGIN_ROOTFS}/usr/lib/dri/fglrx_dri.so \
             ${glliblinks}dri/fglrx_dri.so
       fi
-    elif [ $(grep -i -m 1 'nvidia' \
+    elif [ $(grep -i -m 1 'Module: nvidia' \
         /etc/hwinfo.gfxcard | wc -l) -ge "1"  -a $xserver_prefnongpl -eq 1 ]
     then
       # we have an nvidia card here
@@ -87,7 +87,7 @@ ${PLUGIN_ROOTFS}/usr/X11R6/lib/modules/\,"
 
       # if we can't find the nongpl kernel module, use gpl xorg
       # nvidia driver
-      if [ -e ${PLUGIN_ROOTFS}/modules/nvidia.ko ]; then
+      if [ -e ${PLUGIN_PATH}/modules/nvidia.ko ]; then
         # sometimes the kernel module needs agpgart
         modprobe agpgart
         # insert kernel driver
-- 
cgit v1.2.3-55-g7522