From cb0073ec4898c5437686f95eddd352d52a0f5cc2 Mon Sep 17 00:00:00 2001
From: Dirk von Suchodoletz
Date: Sat, 8 Jul 2006 16:54:36 +0000
Subject: Fixes for vm-udev, addition of glx-check for ATI, see
 HardwareErkennung too ...

git-svn-id: http://svn.openslx.org/svn/openslx/ld4@277 95ad53e4-c205-0410-b2fa-d234c58c8868
---
 initrd/initrd-stuff/etc/functions | 15 +++++++++------
 initrd/initrd-stuff/init          |  5 +++--
 2 files changed, 12 insertions(+), 8 deletions(-)

(limited to 'initrd/initrd-stuff')

diff --git a/initrd/initrd-stuff/etc/functions b/initrd/initrd-stuff/etc/functions
index a19b3eab..ab9365d2 100644
--- a/initrd/initrd-stuff/etc/functions
+++ b/initrd/initrd-stuff/etc/functions
@@ -2,13 +2,13 @@
 #		linux diskless clients (included by init, hwautocfg,
 #		servconfig, ... within initial ramdisk) 
 #
-# Author(s):    Dirk von Suchodoletz <dirk@goe.net>, 26-06-2006
+# Author(s):    Dirk von Suchodoletz <dirk@goe.net>, 08-07-2006
 #	 	Felix Endres, 30-04-2006
 #		Tobias Maier
 #
 # Copyright:    (c) 2006 - RZ Universitaet Freiburg
 # 
-# Version:      0.4.2d
+# Version:      0.4.2e
 
 #######################################################################
 # set of empty dummy functions (loaded before real functions in the 
@@ -749,18 +749,21 @@ case "${XMODULE}" in
   radeon)
     # check ${XDESC}/ hwsetup.info device string in Cards file and then 
     # for needed components
-    test -f /lib/modules/${KERNEL}/kernel/drivers/char/drm/fglrx.ko && \
-      test -f /usr/X11R6/lib/modules/drivers/fglrx_drv.o
+    test -f /mnt/lib/modules/${KERNEL}/kernel/drivers/char/drm/fglrx.ko && \
+      test -f /mnt/usr/X11R6/lib/modules/drivers/fglrx_drv.o && \
+      XMODULE=fglrx
   ;;
   nv)
     #
-    # test -f /usr/X11R6/lib/modules/drivers/nvidia_drv.o
+    # test -f /mnt/usr/X11R6/lib/modules/drivers/nvidia_drv.o
   ;;
 esac
 }
 
 #######################################################################
-# dummy functions
+# dummy functions - avoid undefined functions in servconfig (functions
+# are normally overwritten by settings within distro-functions - a file
+# generated by mkdxsconfig from <distro>/functions-default & ~-version
 
 # overwrite xorg configuration set by hwautocfg
 displayvars (){
diff --git a/initrd/initrd-stuff/init b/initrd/initrd-stuff/init
index 0530a8cd..06be1eba 100755
--- a/initrd/initrd-stuff/init
+++ b/initrd/initrd-stuff/init
@@ -2,12 +2,12 @@
 # Description:  main script for new type of initial ramdisk for
 #               linux diskless clients version 4 
 #
-# Author(s):    Dirk von Suchodoletz <dirk@goe.net>, 03-07-2006
+# Author(s):    Dirk von Suchodoletz <dirk@goe.net>, 05-07-2006
 #
 # Copyright:    (c) 2006 - RZ Universitaet Freiburg
 #               (c) 2006 - odlx.org project
 #
-# Version:      0.2.4k
+# Version:      0.2.5a
 
 # functions common for all distros, messages contains all error and info
 # output
@@ -357,6 +357,7 @@ if [ -n "${UNIONFS}" ] ; then
   echo "Using UnionFS for rw access"
   mkdir -p ${RWDIR}/union ${RWDIR}/uniontmp /rorootfs
   mount -n -t tmpfs none ${RWDIR}/uniontmp
+  # hack for handling unionfs with patched run-init
   mount --move /mnt /rorootfs
   mount -n -t unionfs -o dirs=${RWDIR}/uniontmp=rw:/rorootfs=${NFSRO}ro \
     none /mnt
-- 
cgit v1.2.3-55-g7522