diff options
| author | Bastian Wissler | 2008-10-16 21:06:03 +0200 |
|---|---|---|
| committer | Bastian Wissler | 2008-10-16 21:06:03 +0200 |
| commit | fcae4dc85f0295e00796501054bab6e4c39fd718 (patch) | |
| tree | 434067f3f9af8c702def90302c34134cbc25fd83 /os-plugins/plugins/xserver/XX_xserver.sh | |
| parent | xserver: * suse-11.0 installation: nvidia determines right module-version itself (diff) | |
| download | core-fcae4dc85f0295e00796501054bab6e4c39fd718.tar.gz core-fcae4dc85f0295e00796501054bab6e4c39fd718.tar.xz core-fcae4dc85f0295e00796501054bab6e4c39fd718.zip | |
xserver: linked default mesa libs back, when needed (stage3)
git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@2349 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 | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/os-plugins/plugins/xserver/XX_xserver.sh b/os-plugins/plugins/xserver/XX_xserver.sh index 72b7faac..93d74d30 100644 --- a/os-plugins/plugins/xserver/XX_xserver.sh +++ b/os-plugins/plugins/xserver/XX_xserver.sh @@ -128,6 +128,18 @@ ${PLUGIN_ROOTFS}/usr/X11R6/lib/modules/\," ln -s ${PLUGIN_ROOTFS}/usr/lib/libGL.so.1 \ ${LINK_PATH}libGL.so.1.2 fi + + # link to default mesa libraries if no binary drivers are to be installed + if [ "${xmodule}" != "nvidia" -o "${xmodule}" != "fglrx" ]; then + if [ -e /usr/lib/libGL.so.1.2 ]; then + ln -sf /usr/lib/libGL.so.1.2 /var/X11R6/lib/libGL.so + ln -sf /usr/lib/libGL.so.1.2 /var/X11R6/lib/libGL.so.1 + fi + if [ -e /usr/lib/libGL_MESA.1.2 ]; then + ln -sf /usr/lib/libGL_MESA.so.1.2 /var/X11R6/lib/libGL.so + ln -sf /usr/lib/libGL_MESA.so.1.2 /var/X11R6/lib/libGL.so.1 + fi + fi set +x ###################################################################### # end proprietary drivers section |