summaryrefslogtreecommitdiffstats
path: root/abs/core/LinHES-config/xconfig.sh
diff options
context:
space:
mode:
authorJames Meyer <james.meyer@operamail.com>2011-10-20 21:04:33 (GMT)
committerJames Meyer <james.meyer@operamail.com>2011-10-20 21:04:33 (GMT)
commit6b94294cbdc1bbb023b0464221c96cc82d48e002 (patch)
tree18eb54a6ab903dc0ff6002be3a47beadd90324ac /abs/core/LinHES-config/xconfig.sh
parent5759631b138bbee8817dc192d3629fa4bf116e5a (diff)
downloadlinhes_pkgbuild-6b94294cbdc1bbb023b0464221c96cc82d48e002.zip
linhes_pkgbuild-6b94294cbdc1bbb023b0464221c96cc82d48e002.tar.gz
linhes_pkgbuild-6b94294cbdc1bbb023b0464221c96cc82d48e002.tar.bz2
linhes-config: remove forcing of any driver besides vesa.
Diffstat (limited to 'abs/core/LinHES-config/xconfig.sh')
-rwxr-xr-xabs/core/LinHES-config/xconfig.sh14
1 files changed, 6 insertions, 8 deletions
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