summaryrefslogtreecommitdiffstats
path: root/abs/core-testing/LinHES-config/xconfig.sh
diff options
context:
space:
mode:
authorJames Meyer <james.meyer@operamail.com>2008-11-29 21:41:41 (GMT)
committerJames Meyer <james.meyer@operamail.com>2008-11-29 21:41:41 (GMT)
commitf6313d0af90dee3a03b49a77cc61926a0ff801cc (patch)
tree840588f06b8e6dc799b4d57a781666704604dfba /abs/core-testing/LinHES-config/xconfig.sh
parent1a0666f61207432bdad49c494c16ccd1d06ba4b9 (diff)
downloadlinhes_pkgbuild-f6313d0af90dee3a03b49a77cc61926a0ff801cc.zip
linhes_pkgbuild-f6313d0af90dee3a03b49a77cc61926a0ff801cc.tar.gz
linhes_pkgbuild-f6313d0af90dee3a03b49a77cc61926a0ff801cc.tar.bz2
Add option to force vesa driver from the kernel cmdline
forceXvesa.
Diffstat (limited to 'abs/core-testing/LinHES-config/xconfig.sh')
-rwxr-xr-xabs/core-testing/LinHES-config/xconfig.sh14
1 files changed, 12 insertions, 2 deletions
diff --git a/abs/core-testing/LinHES-config/xconfig.sh b/abs/core-testing/LinHES-config/xconfig.sh
index 42603d6..4984dc5 100755
--- a/abs/core-testing/LinHES-config/xconfig.sh
+++ b/abs/core-testing/LinHES-config/xconfig.sh
@@ -4,10 +4,17 @@ BASE=""
#TEMPLATES="/usr/share/templates"
function Xvalues {
- VGACARDTYPE=`lspci|grep -i vga|sort -r|head -n 1| cut -d: -f3|cut -d" " -f 2`
+ CMDLINE=$(cat /proc/cmdline)
+ echo $CMDLINE |grep -q forceXvesa
+ if [ $? = 0 ]
+ then
+ VGACARDTYPE=vesa
+ else
+ VGACARDTYPE=`lspci|grep -i vga|sort -r|head -n 1| cut -d: -f3|cut -d" " -f 2`
+ fi
echo $VGACARDTYPE
currentmode=`cat $BASE/etc/X11/xorg.conf |grep Modes|awk -Fs ' { print $2 } '`
- }
+}
function presetupX {
if [ x$XUseAdvanced = x1 ]
@@ -192,6 +199,9 @@ function setupX {
fi
;;
+ vesa) sed -e "s/^.*Modes.*$/\t Modes \"${Xres}\"/" $TEMPLATES/xorg/xorg.conf.vesa > $XORG_CONF
+
+
*) #XCONF=`hwd -x |grep etc`
XCONF=`hwd -x |grep etc|tr -d [:cntrl:]|cut -d\/ -f 2-`