From 91bc3faf0c6582332a783352eb052908f4614495 Mon Sep 17 00:00:00 2001
From: Volker Uhrig
Date: Fri, 22 Aug 2008 12:26:00 +0000
Subject: * changed way to find kernel behaviour

git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@2080 95ad53e4-c205-0410-b2fa-d234c58c8868
---
 os-plugins/plugins/vmware/files/install-vmpl.sh     | 12 +++---------
 os-plugins/plugins/xserver/files/ati-install-dev.sh |  2 +-
 2 files changed, 4 insertions(+), 10 deletions(-)

(limited to 'os-plugins')

diff --git a/os-plugins/plugins/vmware/files/install-vmpl.sh b/os-plugins/plugins/vmware/files/install-vmpl.sh
index f2e3da7e..1d4c8419 100644
--- a/os-plugins/plugins/vmware/files/install-vmpl.sh
+++ b/os-plugins/plugins/vmware/files/install-vmpl.sh
@@ -99,15 +99,9 @@ if [ "${vmplversion}" != "vmpl1.0" ]; then
 fi
 
 echo "   * building vmblock module"
-# TODO: check if /boot/vmlinuz is available if we get the kernel version this way
-#       perhaps we don't need a check... perhaps openslx always use
-#       /boot/vmlinuz
-#       This problem happens 3 times. see below!
-# TODO: error check if build environment isn't installed...
-#TODO: vmblock only v2
 if [ "${vmplversion}" != "vmpl1.0" ]; then
   cd vmblock-only/
-  sed -i "s%^VM_UNAME = .*%VM_UNAME = $(ls /boot/vmlinuz*|grep -v -e "^/boot/vmlinuz$$"|sed 's,/boot/vmlinuz-,,'|sort|tail -n 1)%" Makefile
+  sed -i "s%^VM_UNAME = .*%VM_UNAME = $(find /lib/modules/2.6* -maxdepth 0|sed 's,/lib/modules/,,g'|sort|tail -n1)%" Makefile
   make -s
   mv vmblock.ko vmblock.o ../../../../../modules
   cd ..
@@ -115,14 +109,14 @@ fi
 
 echo "   * building vmmon module"
 cd vmmon-only
-sed -i "s%^VM_UNAME = .*%VM_UNAME = $(ls /boot/vmlinuz*|grep -v -e "^/boot/vmlinuz$$"|sed 's,/boot/vmlinuz-,,'|sort|tail -n 1)%" Makefile
+sed -i "s%^VM_UNAME = .*%VM_UNAME = $(find /lib/modules/2.6* -maxdepth 0|sed 's,/lib/modules/,,g'|sort|tail -n1)%" Makefile
 make -s
 mv vmmon.ko vmmon.o ../../../../../modules
 cd ..
     
 echo "   * building vmnet module"
 cd vmnet-only
-sed -i "s%^VM_UNAME = .*%VM_UNAME = $(ls /boot/vmlinuz*|grep -v -e "^/boot/vmlinuz$$"|sed 's,/boot/vmlinuz-,,'|sort|tail -n 1)%" Makefile
+sed -i "s%^VM_UNAME = .*%VM_UNAME = $(find /lib/modules/2.6* -maxdepth 0|sed 's,/lib/modules/,,g'|sort|tail -n1)%" Makefile
 make -s
 mv vmnet.ko vmnet.o ../../../../../modules
 cd ../../../../../..
diff --git a/os-plugins/plugins/xserver/files/ati-install-dev.sh b/os-plugins/plugins/xserver/files/ati-install-dev.sh
index 561fa71a..9fe904a1 100755
--- a/os-plugins/plugins/xserver/files/ati-install-dev.sh
+++ b/os-plugins/plugins/xserver/files/ati-install-dev.sh
@@ -35,7 +35,7 @@ cd ati
 # packages and distribution stuff
 cd temp/common/lib/modules/fglrx/build_mod
 # faking environment
-uname_r=$(find /lib/modules/2.6* -maxdepth 0|grep -v -e "^/lib/modules/$$"|sed 's,/lib/modules/,,g'|sort|tail -n1)
+uname_r=$(find /lib/modules/2.6* -maxdepth 0|sed 's,/lib/modules/,,g'|sort|tail -n1)
 sed -i "s,^uname_r.*$,uname_r=${uname_r}," make.sh
 sed -i "s,kernel_release=.*,kernel_release=${uname_r}," make.sh
 #uname -m: just x86_64 and ia64 will get checked. till we support 64bit
-- 
cgit v1.2.3-55-g7522