Support for nvidia too, still to be checked. Disable parallel start of

runlevel scripts in SuSE (no gain, but trouble), tvout option ...



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

1 files changed, 23 insertions, 15 deletions

diff --git a/initramfs/distro-specs/suse/functions-10.1 b/initramfs/distro-specs/suse/functions-10.1
index 136fe664..e36fd1af 100644
--- a/initramfs/distro-specs/suse/functions-10.1
+++ b/initramfs/distro-specs/suse/functions-10.1
@@ -120,29 +120,37 @@ sed -e "s,RC_LANG=.*,RC_LANG=\"${LANG}\" # added in initrd," \
     -i /mnt/etc/${D_SYSCONFDIR}/language
 }
 
-# check the glx stuff and configure it
-checkglx () {
+# check the glx and tvout stuff and configure it
+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
+        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
         }
-      # there seems no problem, if no TV is connected
-      #TVOUT='\tOption\t\t"TVFormat" "PAL-B"\n
-#\tOption\t\t"DesktopSetup" "horizontal"'
+    # 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
   ;;
   nv)
-    #
-    # test -f /mnt/usr/X11R6/lib/modules/drivers/nvidia_drv.*
-    # gllib=$(ls /usr/X11R6/lib/libGL.so.1.0.*)
-    # ln -sf $gllib /mnt/usr/X11R6/lib/libGL.so.1 2>/dev/null
-
+    # check for needed components
+    test -e /mnt/lib/modules/${KERNEL}/kernel/drivers/char/drm/nvidia.ko \
+      && test -e /mnt/usr/X11R6/lib/modules/drivers/nvidia_drv.* && {
+        gllib=$(ls /usr/X11R6/lib/libGL.so.1.0.* 2>/dev/null|sed -n "1p")
+        if [ -n "$gllib" ] ; then
+          ln -sf $gllib /mnt/usr/X11R6/lib/libGL.so.1 2>/dev/null
+          XMODULE=nvidia
+        fi
+        }
   ;;
 esac
-} 
+}