diff options
author | Bastian Wissler | 2008-09-17 20:06:18 +0200 |
---|---|---|
committer | Bastian Wissler | 2008-09-17 20:06:18 +0200 |
commit | ca965b52ae46e2930e635f32deeb4654f24f71e6 (patch) | |
tree | 595b786999ed83c69ae490467bbb63d502eb77cc /os-plugins | |
parent | * fixed bug with allowshutdown (diff) | |
download | core-ca965b52ae46e2930e635f32deeb4654f24f71e6.tar.gz core-ca965b52ae46e2930e635f32deeb4654f24f71e6.tar.xz core-ca965b52ae46e2930e635f32deeb4654f24f71e6.zip |
Bugfixes in linkage.sh - the linker skript for xserver binary drivers
git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@2236 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'os-plugins')
-rwxr-xr-x | os-plugins/plugins/xserver/files/linkage.sh | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/os-plugins/plugins/xserver/files/linkage.sh b/os-plugins/plugins/xserver/files/linkage.sh index ad23bed8..79e92a03 100755 --- a/os-plugins/plugins/xserver/files/linkage.sh +++ b/os-plugins/plugins/xserver/files/linkage.sh @@ -1,4 +1,4 @@ -#!/bin/bash --debugger +#!/bin/bash # # @@ -15,11 +15,7 @@ LINK_PATH="/var/X11R6/lib/" ATIROOT="${PLUGIN_PATH}ati" NVROOT="${PLUGIN_PATH}nvidia" -# this is a backup folder for mesa files -MESAROOT="${PLUGIN_PATH}mesa/" -if [ ! -d "${MESAROOT}usr/lib/" ]; then - mkdir -p "${MESAROOT}usr/lib/" -fi +# this is the diversion path of libraries if [ ! -d "${LINK_PATH}" ]; then mkdir -p "${LINK_PATH}" fi @@ -69,6 +65,11 @@ divert() { # files to compare CMPROOT="$2" + if [ -e "${ROOT}/installed" ]; then + echo "$1 already linked!" + return + fi + # go through all libs and see if they are conflicting for lib in $(find ${ROOT} -wholename \ "*/xorg/modules" -prune -a '!' -type d \ @@ -121,6 +122,9 @@ divert() { ln -s $lib $cmplib fi done + + # mark as installed - we don't want to install it twice + date >> ${ROOT}/installed } @@ -130,7 +134,7 @@ divert() { # # just run this function to clean up system ############################################### -function uninstDist() { +uninstDist() { # put mesa implementation back into place for file in $(find /usr/lib/ -name '*_MESA.so*' | xargs); do mesafile="$(echo ${file}|sed -e 's/_MESA.so/.so/')" |