summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--os-plugins/plugins/xserver/XX_xserver.sh7
-rwxr-xr-xos-plugins/plugins/xserver/files/suse-gfx-install.sh4
2 files changed, 9 insertions, 2 deletions
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 ..