xserver: * changes to suse-11.0-graphics installation / * changes to stage3

git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@2342 95ad53e4-c205-0410-b2fa-d234c58c8868

2 files changed, 7 insertions, 5 deletions

diff --git a/os-plugins/plugins/xserver/files/linkage.sh b/os-plugins/plugins/xserver/files/linkage.sh
index b8921a7a..c5ff3efa 100755
--- a/os-plugins/plugins/xserver/files/linkage.sh
+++ b/os-plugins/plugins/xserver/files/linkage.sh
@@ -82,7 +82,6 @@ divert() {
     # strip leading ROOT
     cmplib="${lib#${ROOT}}"
 
-    echo ${cmplib} ${lib}
     if [ -e "${cmplib}" -a -e "${lib}" ]; then
       # system folder conflicts with ROOT
       linkMesa ${cmplib}
diff --git a/os-plugins/plugins/xserver/files/suse-gfx-install.sh b/os-plugins/plugins/xserver/files/suse-gfx-install.sh
index 6c016364..61ec61ec 100755
--- a/os-plugins/plugins/xserver/files/suse-gfx-install.sh
+++ b/os-plugins/plugins/xserver/files/suse-gfx-install.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Currently only suse 10.2 is supported!
+# Currently only suse 10.2 and 11.0 is supported!
 #
 
 BUSYBOX="/mnt/opt/openslx/share/busybox/busybox"
@@ -66,7 +66,7 @@ if [ "$1" = "nvidia" ]; then
     for RPM in $URLS; do
       RNAME=$(echo ${RPM} | sed -e 's,^.*/\(.*\)$,\1,g')
       rm -rf ${RNAME} 
-      wget ${RPM} 2>&1 /dev/null
+      wget ${RPM} 2>&1 > /dev/null
       # We use rpm2cpio from suse to extract
       rpm2cpio ${RNAME} | ${BUSYBOX} cpio -id > /dev/null
     done
@@ -94,20 +94,23 @@ if [ "$1" = "ati" ]; then
 
   if [ "11.0" = "`cat /etc/SuSE-release | tail -n1 | cut -d' ' -f3`" ]; then
     echo "  * Downloading ati rpm packages... this could take some time..."
+
+    #TODO: ADD SUFFIX for used kernel detection
+    SUFF=pae
     # add repository for nvidia drivers
     zypper addrepo http://www2.ati.com/suse/11.0/ ATI
     # confirm authenticity of key (once) 
     # -> After key is cached, this is obsolete
     zypper se -r ATI x11-video-fglrxG01
     # get URLs by virtually installing nvidia-OpenGL driver
-    zypper -n -vv install -D ati-fglrxG01-kmp-pae x11-video-fglrxG01 > logfile
+    zypper -n -vv install -D ati-fglrxG01-kmp${SUFF} x11-video-fglrxG01 > logfile
 
     # take unique urls from logfile
     URLS=$(cat logfile |  grep -P -o "http://.*?rpm " | grep fglrx | sort -u | xargs)
     for RPM in $URLS; do
       RNAME=$(echo ${RPM} | sed -e 's,^.*/\(.*\)$,\1,g')
       rm -rf ${RNAME} 
-      wget ${RPM} 2>&1 /dev/null
+      wget ${RPM} 2>&1 > /dev/null
       # We use rpm2cpio from suse to extract
       rpm2cpio ${RNAME} | ${BUSYBOX} cpio -id > /dev/null
     done