Merge branch 'master' of git://github.com/hensing/OpenELEC.tv

This commit is contained in:
Stephan Raue 2011-10-09 12:30:41 +02:00
commit e680be41f0
2 changed files with 12 additions and 3 deletions

View File

@ -27,7 +27,12 @@ if lspci -n | grep 0300 | grep -q 10de; then
fi
if lspci -n | grep 0300 | grep -q 1002; then
[ -f /usr/bin/aticonfig ] && TEMP=`/usr/bin/aticonfig --od-gettemperature | grep Temperature | cut -f 2 -d "-" | cut -f 1 -d "." | sed -e "s, ,,"`
if [ -f /storage/.config/xorg.conf ]; then
XORG="/storage/.config/xorg.conf"
else
XORG="/etc/X11/xorg-fglrx.conf"
fi
[ -f /usr/bin/aticonfig ] && TEMP=`/usr/bin/aticonfig -i $XORG --od-gettemperature | grep Temperature | cut -f 2 -d "-" | cut -f 1 -d "." | sed -e "s, ,,"`
fi
echo "${TEMP} C"

View File

@ -1,7 +1,11 @@
Section "ServerLayout"
Identifier "aticonfig Layout"
Screen 0 "screen" 0 0
EndSection
Section "Device"
Identifier "fglrx"
Driver "fglrx"
Option "HWCursor" "false"
EndSection