Support for commercial X servers (ATI at the moment ...)

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

4 files changed, 17 insertions, 13 deletions

diff --git a/initramfs/distro-specs/suse/functions-10.1 b/initramfs/distro-specs/suse/functions-10.1
index 030bb850..136fe664 100644
--- a/initramfs/distro-specs/suse/functions-10.1
+++ b/initramfs/distro-specs/suse/functions-10.1
@@ -121,18 +121,18 @@ sed -e "s,RC_LANG=.*,RC_LANG=\"${LANG}\" # added in initrd," \
 }
 
 # check the glx stuff and configure it
-glxcheck () {
+checkglx () {
 case "${XMODULE}" in
   radeon)
     # check ${XDESC}/ hwsetup.info device string in Cards file and then
     # for needed components
-    test -f /mnt/lib/modules/${KERNEL}/kernel/drivers/char/drm/fglrx.ko \
-      && test -f /mnt/usr/X11R6/lib/modules/drivers/fglrx_drv.* && { 
+    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 /mnt/usr/X11R6/lib/libGL.so.1.0.* \
-           /usr/X11R6/lib/libGL.so.1 2>/dev/null
-         }
+         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"'
@@ -140,6 +140,9 @@ case "${XMODULE}" in
   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
+
   ;;
 esac
 } 
diff --git a/initramfs/initrd-stuff/bin/hwautocfg b/initramfs/initrd-stuff/bin/hwautocfg
index 902f6251..ccd56aa8 100755
--- a/initramfs/initrd-stuff/bin/hwautocfg
+++ b/initramfs/initrd-stuff/bin/hwautocfg
@@ -61,7 +61,7 @@ local Monitor='\tIdentifier "Default"\n
 \tOption\t\t"CalcAlgorithm"\t"CheckDesktopGeometry"\n
 \tHorizSync\tHS\n
 \tVertRefresh\tVS\n
-\tOption\t"DPMS"\t\t"true"'
+\tOption\t\t"DPMS"\t\t"true"'
 local Device='\tIdentifier\t"StdGraphics"\n
 \tVendorName\t"XDESC"\n
 \tDriver\t\t"XMODULE"'
diff --git a/initramfs/initrd-stuff/etc/functions b/initramfs/initrd-stuff/etc/functions
index d1f86ca1..b657c92f 100644
--- a/initramfs/initrd-stuff/etc/functions
+++ b/initramfs/initrd-stuff/etc/functions
@@ -2,7 +2,7 @@
 # (included by init, hwautocfg, servconfig, ... within OpenSLX initial
 # ramfs)
 #
-# Dirk von Suchodoletz <dvs@OpenSLX.com>, 14-11-2006
+# Dirk von Suchodoletz <dvs@OpenSLX.com>, 19-11-2006
 # Felix Endres, 30-04-2006
 # <mj0@uni-freiburg.de> (xenbr), 27-09-2006
 # Tobias Maier
@@ -32,7 +32,6 @@ udev_hotplug () {
 :
 }
 
-
 #############################################################################
 # generate events with the sysfs trigger
 trigger_device_events () {
@@ -547,6 +546,8 @@ waitfor () {
 local file=$1
 local maxwait=$2
 local count=0
+[ -z $file ] && return 0
+[ -z $maxwait ] && maxwait=5000
 while [ ! -e $file ] ; do
   echo "waiting ........." > /dev/null
   count=`expr $count + 1`
diff --git a/initramfs/initrd-stuff/init b/initramfs/initrd-stuff/init
index 54400eb0..167224eb 100755
--- a/initramfs/initrd-stuff/init
+++ b/initramfs/initrd-stuff/init
@@ -2,7 +2,7 @@
 # main script for new type of initial ramdisk for OpenSLX linux diskless
 # clients version 4
 #
-# Dirk von Suchodoletz <dirk@goe.net>, 03-11-2006
+# Dirk von Suchodoletz <dirk@goe.net>, 19-11-2006
 # <mj0@uni-freiburg.de> (xenbr), 27-09-2006
 #
 # (c) 2006 - RZ Universitaet Freiburg
@@ -181,9 +181,8 @@ line in $0\nnfsroot=\"${nfsroot}\"\n" >> /etc/machine-setup
     # deprecated: nfs server and path (will be removed soon)
     nfsroot=*)
       nfsroot=${opts#nfsroot=}
-      # conversion to new system:
-      root_path=${nfsroot#*:}
-      nfsserver=${nfsroot%:*}
+      #root_path=
+      #nfsserver=
       echo -e "\n# nfs root information gotten via kernel command line in $0\n\
 nfsroot=\"${nfsroot}\"\n" >> /etc/machine-setup
     ;;
@@ -409,6 +408,7 @@ if [ -n "${UNIONFS}" ] ; then
     none /mnt
   mkdir -p /mnt/uniontmp
   mount -n --move ${RWDIR}/uniontmp /mnt/uniontmp
+  chmod 0755 /mnt/uniontmp /mnt
   # if additional sources should be used for a combined root filesystem
   # probably more sources should be merged into union (${UNION} is defined)
   # allow more than one union??