Several small fixes for suse 10.2 setup, integration of commercial X

servers for ATI and NVidia ... updated exclude files ...



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

1 files changed, 28 insertions, 20 deletions

diff --git a/initramfs/distro-specs/suse/functions-10.2 b/initramfs/distro-specs/suse/functions-10.2
index b53f04c1..62fb1f3d 100644
--- a/initramfs/distro-specs/suse/functions-10.2
+++ b/initramfs/distro-specs/suse/functions-10.2
@@ -32,8 +32,9 @@ else
   echo -e "#!$shell\n:" >/usr/sbin/alsactl
   rm /etc/udev/rules.d/60-persistent-storage.rules 2>/dev/null
   chmod u+x /sbin/* /lib/udev/* /usr/sbin/*
-  echo -e "tty:x:5:\ndisk:x:6:\nlp:x:7:\nkmem:x:9:\nuucp:x:14:\naudio:x:17:\n\
-video:x:33:" > /etc/group
+  echo -e "tty:x:5:\ndisk:x:6:\nlp:x:7:\nkmem:x:9:\nuucp:x:14:\n\
+dialout:x:16:\naudio:x:17:\nvideo:x:33:\nvboxusers:!:1000:" > /etc/group
+  echo -e "root:x:0:0:::\nasterisk:x:106:16:::" > /etc/passwd
 fi
 }
 
@@ -141,20 +142,27 @@ checkgraphix () {
 # test if unionfs
 case "${XMODULE}" in
   radeon)
-    # check ${XDESC}/ hwsetup.info device string in Cards file and then
-    # for needed components
-    test -e /mnt/lib/modules/${KERNEL}/kernel/drivers/char/drm/fglrx.ko \
-      && test -e /mnt/usr/X11R6/lib/modules/drivers/fglrx_drv.* && { 
-        XMODULE=fglrx
-        # it only works for UnionFS enabled systems
-        ln -sf /usr/X11R6/lib/libGL.so.1.2 \
-          /mnt/usr/X11R6/lib/libGL.so.1 2>/dev/null
-        }
-    # check whether to enable tvout
-    if [ -n "$tvout" ] && [ "$tvout" != "no" -a "$tvout" != "NO" ] ; then
-      [ "$tvout" = "yes" ] && tvout="PAL-B"
-      TVOUT='\tOption\t\t"TVFormat" "'$tvout
-      TVOUT=$TVOUT'"\n\tOption\t\t"DesktopSetup" "horizontal"'
+    # IGP is not supported with fglrx driver (at least not in some versions)
+    # comment if it works properly ...
+    if ! strinfile " IGP" /tmp/hwsetup.info ; then
+      # check ${XDESC}/ hwsetup.info device string in Cards file and then
+      # for needed components
+      test -e /mnt/lib/modules/${KERNEL}/kernel/drivers/char/drm/fglrx.ko \
+        && test -e /mnt/usr/lib/xorg/modules/drivers/fglrx_drv.* && { 
+          XMODULE=fglrx
+          # it only works for UnionFS enabled systems or put it in preload
+          # but that might be not to clever :-)
+          ln -sf /usr/lib/xorg/libGL.so.1.2 \
+            /mnt/usr/lib/libGL.so.1.2 2>/dev/null || \
+          echo -e "/usr/lib/xorg/libGL.so.1.2\n/usr/lib/xorg/libGL.so.1\n\
+/usr/lib/xorg/libGL.so" >/mnt/etc/ld.so.preload
+          }
+      # check whether to enable tvout
+      if [ -n "$tvout" ] && [ "$tvout" != "no" -a "$tvout" != "NO" ] ; then
+        [ "$tvout" = "yes" ] && tvout="PAL-B"
+        TVOUT='\tOption\t\t"TVFormat" "'$tvout
+        TVOUT=$TVOUT'"\n\tOption\t\t"DesktopSetup" "horizontal"'
+      fi
     fi
   ;;
   nv)
@@ -163,17 +171,17 @@ case "${XMODULE}" in
       && test -e /mnt/usr/X11R6/lib/modules/drivers/nvidia_drv.* && {
         gllib=$(ls /mnt/usr/X11R6/lib/libGL.so.1.0.* 2>/dev/null|sed -n "1p")
         if [ -n "$gllib" ] ; then
-          ln -sf ${gllib#/mnt} /mnt/usr/X11R6/lib/libGL.so.1 2>/dev/null
+          ln -sf ${gllib#/mnt} /mnt/usr/lib/libGL.so.1 2>/dev/null
           # same for GLcore lib
           gllib=$(ls /mnt/usr/X11R6/lib/libGLcore.so.1.0.* 2>/dev/null|\
             sed -n "1p")
-          ln -sf ${gllib#/mnt} /mnt/usr/X11R6/lib/libGLcore.so.1 2>/dev/null \
+          ln -sf ${gllib#/mnt} /mnt/usr/lib/libGLcore.so.1.0 2>/dev/null \
             || fail=1
           # load server modules (trick put the path before the official one)
           testmkd /mnt/etc/X11/modules
-          ln -sf /usr/X11R6/lib/modules/updates/extensions/libglx.so \
+          ln -sf /usr/lib/xorg/modules/updates/extensions/libglx.so \
             /mnt/etc/X11/modules/libglx.so || fail=1
-          ln -sf /usr/X11R6/lib/modules/updates/drivers/nvidia_drv.so \
+          ln -sf /usr/lib/xorg/modules/updates/drivers/nvidia_drv.so \
             /mnt/etc/X11/modules/nvidia_drv.so || fail=1
           [ -z $fail ] && XMODULE=nvidia
           # ensure proper permissions for nvidia devices