diff options
Diffstat (limited to 'abs/core-testing/LinHES-config')
| -rwxr-xr-x | abs/core-testing/LinHES-config/PKGBUILD | 4 | ||||
| -rwxr-xr-x | abs/core-testing/LinHES-config/templates/xorg/xorg.conf.vesa | 72 | ||||
| -rwxr-xr-x | abs/core-testing/LinHES-config/xconfig.sh | 14 |
3 files changed, 86 insertions, 4 deletions
diff --git a/abs/core-testing/LinHES-config/PKGBUILD b/abs/core-testing/LinHES-config/PKGBUILD index e587a03..3a25c9d 100755 --- a/abs/core-testing/LinHES-config/PKGBUILD +++ b/abs/core-testing/LinHES-config/PKGBUILD @@ -1,9 +1,9 @@ pkgname=LinHES-config pkgver=1.0 -pkgrel=31 +pkgrel=33 conflicts=(MythVantage-config MythVantage-config-dev LinHES-config-dev ) pkgdesc="Install and configure your system" -depends=(bc libstatgrab mysql-python expect curl dnsutils parted sg3_utils nmbscan) +depends=(bc libstatgrab mysql-python expect curl dnsutils parted sg3_utils nmbscan hwd) arch=('i686') source=(mythinstall.bin myth_user_call file_time_offset.py install-ui.xml install_proxy.sh install_functions.sh systemconfig.sh install_db_chroot.sh restore_default_settings.sh xconfig.sh timezip.py soundconfig.sh LinHES-release issue MythVantage.sh create_master.sh build_diskless.sh networkconfig.sh timezone.bin autocard.py restore_km_db_chroot.sh) diff --git a/abs/core-testing/LinHES-config/templates/xorg/xorg.conf.vesa b/abs/core-testing/LinHES-config/templates/xorg/xorg.conf.vesa new file mode 100755 index 0000000..c569819 --- /dev/null +++ b/abs/core-testing/LinHES-config/templates/xorg/xorg.conf.vesa @@ -0,0 +1,72 @@ +# nvidia-xconfig: X configuration file generated by nvidia-xconfig +# nvidia-xconfig: version 1.0 (buildmeister@builder3) Tue Aug 1 21:11:12 PDT 2006 + +Section "ServerLayout" + Identifier "Layout0" + Screen 0 "Screen0" + InputDevice "Keyboard0" "CoreKeyboard" + InputDevice "Mouse0" "CorePointer" +EndSection + +Section "Files" + RgbPath "/usr/X11R6/lib/X11/rgb" +EndSection + +Section "Module" + Load "dbe" + Load "extmod" + Load "type1" + Load "freetype" + +EndSection + +Section "InputDevice" + # generated from default + Identifier "Mouse0" + Driver "mouse" + Option "Protocol" "auto" + Option "Device" "/dev/psaux" + Option "Emulate3Buttons" "no" + Option "ZAxisMapping" "4 5" +EndSection + +Section "InputDevice" + # generated from default + Identifier "Keyboard0" + Driver "keyboard" +EndSection + +Section "Monitor" + Identifier "Monitor0" + VendorName "Unknown" + ModelName "Unknown" + HorizSync 30.0 - 110.0 + VertRefresh 50.0 - 150.0 + Option "DPMS" "false" + Modeline "1280x720" 74.25 1280 1316 1452 1644 720 720 723 751 -hsync +vsync + Modeline "1280x720_60.00" 74.25 1280 1352 1432 1648 720 725 730 750 -hsync -vsync + ModeLine "848x480" 34.0 848 880 1016 1072 480 494 495 527 -hsync -vsync + Modeline "800x600" 38.34 800 832 928 1024 600 604 608 624 -HSync -VSync + ModeLine "NTSC-DVD-72p" 32.432 720 736 800 858 480 484 492 525 +EndSection + +Section "Device" + Identifier "Device0" + Driver "vesa" + VendorName "Generic Corporation" + Option "DPI" "100 x 100" + + +EndSection + +Section "Screen" + Identifier "Screen0" + Device "Device0" + Monitor "Monitor0" + DefaultDepth 24 + SubSection "Display" + Depth 24 + Modes "1280x720" + EndSubSection +EndSection + 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-` |