From d6b7133e1ce44939aa7e860b2e2240ba433cb392 Mon Sep 17 00:00:00 2001
From: Bastian Wissler
Date: Thu, 16 Oct 2008 17:11:21 +0000
Subject: xserver: * stage3 changes / * changes in suse graphics install skript

git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@2344 95ad53e4-c205-0410-b2fa-d234c58c8868
---
 os-plugins/plugins/xserver/XX_xserver.sh             | 7 +++++++
 os-plugins/plugins/xserver/files/suse-gfx-install.sh | 4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)

(limited to 'os-plugins/plugins')

diff --git a/os-plugins/plugins/xserver/XX_xserver.sh b/os-plugins/plugins/xserver/XX_xserver.sh
index c95a3c65..8ca87c28 100644
--- a/os-plugins/plugins/xserver/XX_xserver.sh
+++ b/os-plugins/plugins/xserver/XX_xserver.sh
@@ -80,6 +80,13 @@ ${PLUGIN_ROOTFS}/usr/X11R6/lib/modules/\,"
         ln -s ${PLUGIN_ROOTFS}/usr/lib/dri/fglrx_dri.so \
         ${LINK_PATH}dri/fglrx_dri.so
       fi
+
+      # TODO: This should be fixed in linkage.sh - later
+      DRILPATH=/mnt/var/X11R6/lib/usr/X11R6/lib/modules/dri/
+      mkdir -p "${DRILPATH}"
+      ln -s ${PLUGIN_ROOTFS}/usr/lib/modules/dri/fglrx_dri.so "${DRILPATH}fglrx_dri.so"
+      # TODO: end
+
       ln -s ${PLUGIN_ROOTFS}/usr/lib/libGL.so.1.2 \
       ${LINK_PATH}libGL.so
       ln -s ${PLUGIN_ROOTFS}/usr/lib/libGL.so.1.2 \
diff --git a/os-plugins/plugins/xserver/files/suse-gfx-install.sh b/os-plugins/plugins/xserver/files/suse-gfx-install.sh
index 61ec61ec..902ffeb5 100755
--- a/os-plugins/plugins/xserver/files/suse-gfx-install.sh
+++ b/os-plugins/plugins/xserver/files/suse-gfx-install.sh
@@ -96,7 +96,7 @@ if [ "$1" = "ati" ]; then
     echo "  * Downloading ati rpm packages... this could take some time..."
 
     #TODO: ADD SUFFIX for used kernel detection
-    SUFF=pae
+    SUFF="-pae"
     # add repository for nvidia drivers
     zypper addrepo http://www2.ati.com/suse/11.0/ ATI
     # confirm authenticity of key (once) 
@@ -117,7 +117,7 @@ if [ "$1" = "ati" ]; then
     mv ./usr/X11R6/lib/* ./usr/lib/
    # fix for fglrx_dri.so 
     mkdir -p ./usr/X11R6/lib/modules/dri
-    ln -s /opt/openslx/plugin-repo/xserver/ati/usr/lib/dri/fglrx_dri.so \
+    ln -s ../../../../lib/dri/glrx_dri.so \
     ./usr/X11R6/lib/modules/dri/fglrx_dri.so
     mv ./usr ..
     mv ./etc ..
-- 
cgit v1.2.3-55-g7522