summaryrefslogtreecommitdiffstats
path: root/os-plugins/plugins/xserver/files/ubuntu-8.10-gfx-install.sh
diff options
context:
space:
mode:
authorBastian Wissler2009-01-22 15:55:52 +0100
committerBastian Wissler2009-01-22 15:55:52 +0100
commit49014d364950e5930a7218e324fba24bc5525593 (patch)
tree9f650779d14e2c6e937e9ce07b1efacc047bb0a9 /os-plugins/plugins/xserver/files/ubuntu-8.10-gfx-install.sh
parentIf vmplayer is still to noisy we should try the following two options (diff)
downloadcore-49014d364950e5930a7218e324fba24bc5525593.tar.gz
core-49014d364950e5930a7218e324fba24bc5525593.tar.xz
core-49014d364950e5930a7218e324fba24bc5525593.zip
xserver plugin fixes:
* various fixes for suse-11.0 * various fixes for ubuntu-8.10 (thanks to Sebastian Schmelzer) * rewritten linkage Module (now in Perl) git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@2515 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'os-plugins/plugins/xserver/files/ubuntu-8.10-gfx-install.sh')
-rwxr-xr-xos-plugins/plugins/xserver/files/ubuntu-8.10-gfx-install.sh10
1 files changed, 6 insertions, 4 deletions
diff --git a/os-plugins/plugins/xserver/files/ubuntu-8.10-gfx-install.sh b/os-plugins/plugins/xserver/files/ubuntu-8.10-gfx-install.sh
index 68212ecf..b80348eb 100755
--- a/os-plugins/plugins/xserver/files/ubuntu-8.10-gfx-install.sh
+++ b/os-plugins/plugins/xserver/files/ubuntu-8.10-gfx-install.sh
@@ -79,7 +79,7 @@ case ${TARGET} in
--kernelsourcedir /usr/src/linux-headers-${KVER}/ \
--no-prepare-kernel \
--no-clean-kernel \
- build \
+ rebuild \
> /tmp/dkms.log 2>&1
if [ $? -eq 0 ]; then
echo "ok"
@@ -92,7 +92,8 @@ case ${TARGET} in
exit 1
fi
- FGLRX_MODULE_PATH=$(find ${FGLRX_DKMS_DIR}/${KVER}/ -name fglrx.ko)
+ FGLRX_MODULE_PATH=$(find ${FGLRX_DKMS_DIR}/${KVER}/ -name fglrx.ko \
+ | tail -n1 )
cp ${FGLRX_MODULE_PATH} ${PLUGIN_FOLDER}/ati/modules/fglrx.ko
@@ -174,7 +175,7 @@ case ${TARGET} in
--kernelsourcedir /usr/src/linux-headers-${KVER}/ \
--no-prepare-kernel \
--no-clean-kernel \
- build \
+ rebuild \
> /tmp/dkms.log 2>&1
if [ $? -eq 0 ]; then
echo "ok"
@@ -187,7 +188,8 @@ case ${TARGET} in
exit 1
fi
- NVIDIA_MODULE_PATH=$(find ${NVIDIA_DKMS_DIR}/${KVER}/ -name nvidia.ko)
+ NVIDIA_MODULE_PATH=$(find ${NVIDIA_DKMS_DIR}/${KVER}/ -name \
+ nvidia.ko | tail -n 1)
cp ${NVIDIA_MODULE_PATH} ${PLUGIN_FOLDER}/nvidia/modules/nvidia.ko