diff options
| author | Cecil Hugh Watson <knoppmyth@gmail.com> | 2008-11-30 04:11:03 (GMT) |
|---|---|---|
| committer | Cecil Hugh Watson <knoppmyth@gmail.com> | 2008-11-30 04:11:03 (GMT) |
| commit | f78fc8e0364cb99bf0b3c2fc941ba85c2fe5944f (patch) | |
| tree | 35b4ab3030640a144537124112e3d65d138672f5 /abs/core-testing/LinHES-config/xconfig.sh | |
| parent | fba7ea15ad46f8655bf17ab4c1cc5a8228d39e1b (diff) | |
| parent | f0da28db238a7c58552446e2d87bae48a0f9718b (diff) | |
| download | linhes_pkgbuild-f78fc8e0364cb99bf0b3c2fc941ba85c2fe5944f.zip linhes_pkgbuild-f78fc8e0364cb99bf0b3c2fc941ba85c2fe5944f.tar.gz linhes_pkgbuild-f78fc8e0364cb99bf0b3c2fc941ba85c2fe5944f.tar.bz2 | |
Merge branch 'HEAD' of ssh://cesman@knoppmyth.net/mount/repository/LinHES-PKGBUILD
Diffstat (limited to 'abs/core-testing/LinHES-config/xconfig.sh')
| -rwxr-xr-x | abs/core-testing/LinHES-config/xconfig.sh | 14 |
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-` |