diff options
| author | Bastian Wissler | 2008-10-16 17:34:04 +0200 |
|---|---|---|
| committer | Bastian Wissler | 2008-10-16 17:34:04 +0200 |
| commit | da08febb5d33e59aa9e6b4fc0fcbf06dd2f435a4 (patch) | |
| tree | 463208f672b7ec87131cd1657635c53ac2f05bde /os-plugins | |
| parent | xserver plugin: * Ubuntu modules install fixed/changed - takes the newest dri... (diff) | |
| download | core-da08febb5d33e59aa9e6b4fc0fcbf06dd2f435a4.tar.gz core-da08febb5d33e59aa9e6b4fc0fcbf06dd2f435a4.tar.xz core-da08febb5d33e59aa9e6b4fc0fcbf06dd2f435a4.zip | |
xserver: fglrx changes -> fglrx_dri.so gets linked
git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@2335 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'os-plugins')
| -rw-r--r-- | os-plugins/plugins/xserver/XX_xserver.sh | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/os-plugins/plugins/xserver/XX_xserver.sh b/os-plugins/plugins/xserver/XX_xserver.sh index c7d47e24..c95a3c65 100644 --- a/os-plugins/plugins/xserver/XX_xserver.sh +++ b/os-plugins/plugins/xserver/XX_xserver.sh @@ -37,7 +37,7 @@ if [ -e /initramfs/plugin-conf/xserver.conf -a \ # xorg.conf in /rootfs/etc/X11/xorg.conf if [ $xserver_active -ne 0 -a ! -f /rootfs/${xfc#/mnt} ]; then [ $DEBUGLEVEL -gt 0 ] && echo "executing the 'xserver' os-plugin ..."; - xmodule=$(grep -i -m 1 "XFree86 v4 Server Module" /etc/hwinfo.data | \ + xmodule=$(grep -i -m 1 "XFree86 v4 Server Module" /etc/hwinfo.gfxcard | \ sed "s/.*v4 Server Module: //") # proprietary ATI/NVidia modules listed a different way with hwinfo [ -z "$xmodule" ] || error "${hcfg_hwsetup}" nonfatal @@ -66,7 +66,7 @@ ${PLUGIN_ROOTFS}/usr/X11R6/lib/modules/\," cp -r ${PLUGIN_PATH}/etc/* /mnt/etc/ if [ ! -d "${LINK_PATH}" ]; then # create linkage folder - mkdir -p ${LINK_PATH} + mkdir -p ${LINK_PATH}dri fi chroot /mnt /sbin/insmod ${PLUGIN_ROOTFS}/modules/fglrx.ko @@ -74,6 +74,12 @@ ${PLUGIN_ROOTFS}/usr/X11R6/lib/modules/\," # we need some pci.ids for fglrx driver cp -r "${PLUGIN_PATH}/etc/ati" /mnt/etc/ + # if fglrx_dri.so is linked wrong -> we have to link it here + if [ "1" -eq "$( ls -l /usr/lib/dri/fglrx_dri.so \ + | grep -o "/var/X11R6.*so$" | wc -l )" ]; then + ln -s ${PLUGIN_ROOTFS}/usr/lib/dri/fglrx_dri.so \ + ${LINK_PATH}dri/fglrx_dri.so + fi ln -s ${PLUGIN_ROOTFS}/usr/lib/libGL.so.1.2 \ ${LINK_PATH}libGL.so ln -s ${PLUGIN_ROOTFS}/usr/lib/libGL.so.1.2 \ @@ -83,7 +89,7 @@ ${PLUGIN_ROOTFS}/usr/X11R6/lib/modules/\," fi if [ $(grep -i -m 1 'nvidia' \ - /etc/hwinfo.data | wc -l) -ge "1" -a $xserver_prefnongpl -eq 1 ] + /etc/hwinfo.gfxcard | wc -l) -ge "1" -a $xserver_prefnongpl -eq 1 ] then # we have an ati card here NVIDIA=1 |