1 files changed, 7 insertions, 70 deletions
diff --git a/os-plugins/plugins/xserver/files/nvidia-install.sh b/os-plugins/plugins/xserver/files/nvidia-install.sh
index 9252ef9a..e7b30ab6 100755
--- a/os-plugins/plugins/xserver/files/nvidia-install.sh
+++ b/os-plugins/plugins/xserver/files/nvidia-install.sh
@@ -11,8 +11,6 @@ MODULES_FOLDER="/opt/openslx/plugin-repo/xserver/modules"
 #TODO: check if we still have .../xserver/nvidia folder
 
 
-
-
 cd ${PLUGIN_PATH}
 
 # Ubuntu gfx-install.sh skript
@@ -25,72 +23,11 @@ fi
 # End ubuntu gfx-install.sh
 
 
-
-
-
-
-
-
-mkdir -p ${TMP_FOLDER} ${MODULES_FOLDER}
-cd ${PKG_FOLDER}
-FILE=$(ls NVIDIA-Linux-*|sort|tail -n 1)
-
-echo "  * extracting package"
-cd ${TMP_FOLDER}
-${PKG_FOLDER}/${FILE} -x > /dev/null
-#todo: check if it extracted like it should...
-
-FILEPATH=$(echo ${FILE}|sed 's/.run//')
-NVPATH="${TMP_FOLDER}/${FILEPATH}"
-mv "${NVPATH}/usr" "${PLUGIN_PATH}/nvidia"
-
-echo "  * prepare kernel module"
-UNAME_R=$(find /lib/modules/2.6* -maxdepth 0|sed 's,/lib/modules/,,g'|sort|tail -n1)
-cd ${PLUGIN_PATH}/nvidia/usr/src/nv/
-# dont load module
-sed -e '/.* modprobe .*/d' \
- -i ${PLUGIN_PATH}/nvidia/usr/src/nv/Makefile.kbuild \
- -i ${PLUGIN_PATH}/nvidia/usr/src/nv/Makefile.nvidia \
- -i ${PLUGIN_PATH}/nvidia/usr/src/nv/makefile
-# fake kernel
-# Bastian: the SYSSRC way didnt work in chroot!
-sed -e "s/..shell uname -r./${UNAME_R}/" \
- -i ${PLUGIN_PATH}/nvidia/usr/src/nv/Makefile.kbuild \
- -i ${PLUGIN_PATH}/nvidia/usr/src/nv/Makefile.nvidia \
- -i ${PLUGIN_PATH}/nvidia/usr/src/nv/makefile
-
-echo "  * compile kernel module"
-make module > /dev/null 2&>1
-
-# somehow $? isn't trustworthy...
-if [ -e nvidia.ko ]; then
-  echo "  * Successfully built module nvidia.ko!"
-  mv nvidia.ko ${MODULES_FOLDER}
-else
-  echo -e "\n\n  * Something went wrong while building nvidia.ko module!\n\n\n"
-  #TODO: handle this error => mark plugin as not installed
+# SUSE gfx-install.sh skript
+if [ "1" -eq "$(lsb_release -i | grep 'SUSE' | wc -l)" ]; then
+  # we have SUSE - run ubuntu-gfx-install
+  echo "* Using SuSE packages to install modules and libs"
+  ./suse-gfx-install.sh nvidia
+  exit
 fi
-
-#TODO: remove comment
-#echo "  * cleanup"
-#rm -rf ${TMP_FOLDER} ${PLUGIN_PATH}/nvidia/usr/src
-
-# TODO: perhaps we don't need this part! - it's very slow
-#/./${TEMP_FOLDER}/nvidia-files/nvidia-installer -s --x-prefix=${TEMP_FOLDER} \
-# --no-runlevel-check --no-abi-note --no-x-check\
-# --no-rpms --no-recursion \
-# --x-module-path=${TEMP_FOLDER}/usr/lib/xorg/modules\
-# --x-library-path=${TEMP_FOLDER}/usr/lib\
-# --opengl-prefix=${TEMP_FOLDER}/usr\
-# --opengl-libdir=lib\
-# --utility-prefix=${TEMP_FOLDER}/usr\
-# --utility-libdir=lib\
-# --documentation-prefix=${TEMP_FOLDER}/usr\
-# --no-kernel-module \
-## --kernel-install-path=${TEMP_FOLDER}/lib/modules/${KVERS}/video \
-# 2>&1 > /dev/null
-
-#mv ${TEMP_FOLDER}/src/usr/src ${TEMP_FOLDER}/usr/
-#rm -rf ${TEMP_FOLDER}/usr/share ${TEMP_FOLDER}/src/
-
-
+# End suse gfx-install.sh