diff options
| author | Bastian Wissler | 2009-03-24 19:19:20 +0100 |
|---|---|---|
| committer | Bastian Wissler | 2009-03-24 19:19:20 +0100 |
| commit | 97185b21d3496c40ee52dacf5207553da1759f92 (patch) | |
| tree | a17401f8a2e7606b77c27bc6385087312c97054f /os-plugins/plugins/xserver/XX_xserver.sh | |
| parent | modified check: (diff) | |
| download | core-97185b21d3496c40ee52dacf5207553da1759f92.tar.gz core-97185b21d3496c40ee52dacf5207553da1759f92.tar.xz core-97185b21d3496c40ee52dacf5207553da1759f92.zip | |
xserver plugin:
* fixed strange ATI Bug with "BusID" needed - else X prints stacktrace
git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@2757 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'os-plugins/plugins/xserver/XX_xserver.sh')
| -rw-r--r-- | os-plugins/plugins/xserver/XX_xserver.sh | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/os-plugins/plugins/xserver/XX_xserver.sh b/os-plugins/plugins/xserver/XX_xserver.sh index c4676a17..40475c08 100644 --- a/os-plugins/plugins/xserver/XX_xserver.sh +++ b/os-plugins/plugins/xserver/XX_xserver.sh @@ -91,6 +91,9 @@ if [ -e /initramfs/plugin-conf/xserver.conf -a \ ln -s ${PLUGIN_ROOTFS}/usr/lib/dri/fglrx_dri.so \ ${glliblinks}dri/fglrx_dri.so fi + BUSID=$(grep -m1 -i " SysFS BusID: .*" /etc/hwinfo.gfxcard | \ + awk -F':' '{print "PCI:"$3":"$4}' | sed -e 's,\.,:,g') + echo "${PLUGIN_ROOTFS}/usr/bin/aticonfig --initial" >> /mnt/etc/init.d/boot.slx ATI=1 fi elif $(grep -iq -m 1 'Module: nvidia' /etc/hwinfo.gfxcard) && \ @@ -167,6 +170,7 @@ EndSection Section "Device" Identifier "Generic Video Card" Driver "vesa" +# BusID "PCI:xx" #especially needed for fglrx EndSection Section "Monitor" Identifier "Generic Display" @@ -203,6 +207,11 @@ EndSection' >> $xfc else sed "s/\"us\"/\"${XKEYBOARD}\"/" -i $xfc fi + + if [ -n "${BUSID}" ]; then + sed -e "s,^# BusID .*, BusID \"${BUSID}\",g" -i ${xfc} + fi + # set nodeadkeys for special layouts if [ ${XKEYBOARD} = "de" ]; then sed -e '/\"XkbLayout\"/a\\ \ Option "XkbVariant" "nodeadkeys"' \ |