From 3cc7a26ef6ce5928401162cff95e8a860c8daa36 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Sun, 4 Jan 2009 10:42:01 -0600
Subject: Only check for VGA cards by nvidia, instead of all things nvidia.
---
abs/core-testing/LinHES-config/xconfig.sh | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/abs/core-testing/LinHES-config/xconfig.sh b/abs/core-testing/LinHES-config/xconfig.sh
index db03e6f..ef3e836 100755
--- a/abs/core-testing/LinHES-config/xconfig.sh
+++ b/abs/core-testing/LinHES-config/xconfig.sh
@@ -12,8 +12,9 @@ function Xvalues {
VGACARDTYPE=vesa
else
VGACARDTYPE=`lspci|grep -i vga|sort -r|head -n 1| cut -d: -f3|cut -d" " -f 2`
- CARDID=`lspci -n |grep 10de | cut -d" " -f3 |cut -d: -f2 `
- VENDORID=`lspci -n |grep 10de | cut -d" " -f3 |cut -d: -f1`
+ VGAPCIID=`lspci|grep -i vga|sort -r|head -n 1| cut -d" " -f1`
+ CARDID=`lspci -n |grep $VGAPCIID|grep 10de | cut -d" " -f3 |cut -d: -f2 `
+ VENDORID=`lspci -n |grep $VGAPCIID|grep 10de | cut -d" " -f3 |cut -d: -f1`
fi
echo $VGACARDTYPE
currentmode=`cat $BASE/etc/X11/xorg.conf |grep Modes|awk -Fs ' { print $2 } '`
@@ -142,9 +143,9 @@ echo "#doing the advanced" > /tmp/options
HS="#Hsync edid used "
VR="#Vertrefresh edid used "
fi
-
+
echo "Option \"ForceMonitors\" \"$ConnectedMonitor\"" >> /tmp/options
-
+
sed -e "s/^.*Modes.*$/\t $ML/" \
-e "/INSERT MODELINE/r $TEMPLATES/xorg/modeline.$Xcatagory" \
-e "s/^.*DisplaySize.*$/ $DS/" \
@@ -175,13 +176,14 @@ function setupX {
#nvidia check right here
grep -q $CARDID $NVIDIA_96XX
if [ $? = 0 ]
- then
+ then
#install 96xx drivers
- echo "installing nvidia 96xx drivers"
+ echo "installing nvidia 96xx drivers"
pacman --noconfirm -R libgl-dri > /dev/null 2>&1
pacman --noconfirm -S nvidia-96xx nvidia-96xx-utils > /dev/null 2>&1
else
#install latest drivers
+ echo "installing current nvidia drivers"
pacman --noconfirm -R libgl-dri > /dev/null 2>&1
pacman --noconfirm -S nvidia nvidia-utils > /dev/null 2>&1
fi
@@ -214,7 +216,7 @@ function setupX {
*) XCONF=/root/xorg.conf.new
X -configure
grep -v Modes $XCONF | sed -e '/Depth.*16/a Modes "800x600"' -e '/Depth.*24/a Modes "800x600"' -e 's/dev\/mouse/dev\/psaux/g'> $XORG_CONF
- rm -f $XCONF 2>&1 > /dev/null
+ rm -f $XCONF 2>&1 > /dev/null
;;
esac
fi
--
cgit v0.12