From 6b94294cbdc1bbb023b0464221c96cc82d48e002 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Thu, 20 Oct 2011 16:04:33 -0500
Subject: linhes-config: remove forcing of any driver besides vesa.

---
 abs/core/LinHES-config/PKGBUILD   |  4 ++--
 abs/core/LinHES-config/xconfig.sh | 14 ++++++--------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/abs/core/LinHES-config/PKGBUILD b/abs/core/LinHES-config/PKGBUILD
index 21cb23d..1ed38a6 100644
--- a/abs/core/LinHES-config/PKGBUILD
+++ b/abs/core/LinHES-config/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=LinHES-config
 pkgver=2.3
-pkgrel=31
+pkgrel=34
 conflicts=(MythVantage-config MythVantage-config-dev LinHES-config-dev LinHes-config )
 pkgdesc="Install and configure your system"
 depends=('bc' 'libstatgrab'  'mysql-python' 'expect' 'curl' 'dnsutils' 'parted'
@@ -110,7 +110,7 @@ md5sums=('6259677916192a92d1adf47b276f7829'
          'c20f73d4da5d7e15e1f3eb85c7dcb49a'
          '8ac1cfd2eca0f641737da0d0aca416a7'
          '9ae8d79f620c6d19973c55c32a921874'
-         '17019ff68a8cf95c0b63a429d1fba094'
+         '0fc9a99aa4a62c3880c2204cc5001294'
          'ecf9e5df20683a769c4a8a8f2d65de85'
          'e459ed069317bccb20351f037a9df3d2'
          '97de45a04f4efbd9d40d9fc0e1db1c3f'
diff --git a/abs/core/LinHES-config/xconfig.sh b/abs/core/LinHES-config/xconfig.sh
index 313b489..cf31ef8 100755
--- a/abs/core/LinHES-config/xconfig.sh
+++ b/abs/core/LinHES-config/xconfig.sh
@@ -1,8 +1,8 @@
 #!/bin/bash
 #set -x
-#SET DISPLAYCARD to force a cardtype
 #SET DISPLAYRES to force Xres, ENV takes precendent over cmdline
-#displayres=cmdline
+
+
 LOGFILE=/tmp/xconfig.log
 for i in ati intel mga savage sis unichrome
 do
@@ -23,6 +23,7 @@ function Xvalues {
     echo "$CMDLINE" | grep -q forceXvesa
     if [ $? = 0  ]
     then
+        echo "Forcing driver to vesa"
         VGACARDTYPE=vesa
         Xcardtype=$VGACARDTYPE
     else
@@ -31,12 +32,7 @@ function Xvalues {
         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
-    #force VGACARDTYPE
-    if [ ! x$DISPLAYCARD = x ]
-    then
-        VGACARDTYPE=$DISPLAYCARD
-        Xcardtype=$VGACARDTYPE
-    fi
+
     echo "Detected $VGACARDTYPE as the video card type"
     #currentmode=`cat "$BASE/etc/X11/xorg.conf" | grep Modes | awk -Fs '{ print $2 }'`
 }
@@ -405,6 +401,8 @@ else
         Xres=$DISPLAYRES
     fi
 
+
+
     XORG_CONF="/etc/X11/xorg.conf"
     XVMC_CONFIG="/etc/X11/XvMCConfig"
 fi
-- 
cgit v0.12