summaryrefslogtreecommitdiffstats
path: root/os-plugins
diff options
context:
space:
mode:
authorBastian Wissler2008-10-16 16:11:50 +0200
committerBastian Wissler2008-10-16 16:11:50 +0200
commit30ba549a356ac460e72470e10f386edb3772a4ae (patch)
tree38b18defd6c8d3c36b1ff9928ed38506143cbb90 /os-plugins
parentxserver fix: * linkage.sh does not run with ubuntu dash shell. (diff)
downloadcore-30ba549a356ac460e72470e10f386edb3772a4ae.tar.gz
core-30ba549a356ac460e72470e10f386edb3772a4ae.tar.xz
core-30ba549a356ac460e72470e10f386edb3772a4ae.zip
xserver plugin: * Ubuntu modules install fixed/changed - takes the newest driver module from nvidia
git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@2334 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'os-plugins')
-rwxr-xr-xos-plugins/plugins/xserver/files/ubuntu-gfx-install.sh7
1 files changed, 3 insertions, 4 deletions
diff --git a/os-plugins/plugins/xserver/files/ubuntu-gfx-install.sh b/os-plugins/plugins/xserver/files/ubuntu-gfx-install.sh
index bca5c0e7..6d3345bc 100755
--- a/os-plugins/plugins/xserver/files/ubuntu-gfx-install.sh
+++ b/os-plugins/plugins/xserver/files/ubuntu-gfx-install.sh
@@ -94,11 +94,10 @@ case ${TARGET} in
# extract $DEB
dpkg-deb -x ${NVIDIA_DEB} ${PLUGIN_FOLDER}/nvidia
- # assemble modules
+ # assemble module - we just need the new one here
+ # TODO: modules for older graphics hardware can be found here
cd modules/lib/linux-restricted-modules/${KVER}/
- for module in nvidia nvidia_legacy nvidia_new; do
- ld_static -d -r -o ${PLUGIN_FOLDER}/nvidia/modules/${module}.ko ${module}/*
- done
+ ld_static -d -r -o ${PLUGIN_FOLDER}/nvidia/modules/nvidia.ko nvidia_new/*
#TODO: if we use this part, we need to copy the check from ati, too!
#if [ -f /usr/lib/dri/fglrx_dri.so ]; then