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

9 files changed, 28 insertions, 21 deletions

diff --git a/initrd/distro-specs/debian/functions-default b/initrd/distro-specs/debian/functions-default
index 6c21c049..25143c86 100644
--- a/initrd/distro-specs/debian/functions-default
+++ b/initrd/distro-specs/debian/functions-default
@@ -258,7 +258,7 @@ devices\n# during vmware sessions. If you like to remove certain modules \
 add them\n# to the list below - Dirk von Suchodoletz, <dirk@goe.net>\n\
 STATE=1\nps aux|grep -i vmware|grep -v \"grep\" &>/dev/null && { STATE=0; \
 /sbin/rmmod usb-storage &>/tmp/null; }\n\
-[ x$ACTION = xremove ] && { [ $STATE = 0 ] && /sbin/rmmod usb-storage \
+[ x\$ACTION = xremove ] && { [ \$STATE = 0 ] && /sbin/rmmod usb-storage \
 &>/dev/null; }\nexit \$STATE" > /mnt/var/X11R6/bin/vm-udev
 chmod u+x /mnt/var/X11R6/bin/vm-udev
 echo -e "# special entry to block linux from reacting to usb events during \
diff --git a/initrd/distro-specs/gentoo/config-2005.1 b/initrd/distro-specs/gentoo/config-default
index 2bae4d17..2bae4d17 100644
--- a/initrd/distro-specs/gentoo/config-2005.1
+++ b/initrd/distro-specs/gentoo/config-default
diff --git a/initrd/distro-specs/gentoo/functions-2005.1 b/initrd/distro-specs/gentoo/functions-default
index 4eae04a3..f3b3d633 100644
--- a/initrd/distro-specs/gentoo/functions-2005.1
+++ b/initrd/distro-specs/gentoo/functions-default
@@ -2,11 +2,11 @@
 #               linux diskless clients (executed within initial ramdisk 
 #               after genconfig) 
 #
-# Author(s):    Dirk von Suchodoletz <dirk@goe.net>, 23-06-2006
+# Author(s):    Dirk von Suchodoletz <dirk@goe.net>, 08-07-2006
 #
 # Copyright:    (c) 2006 - RZ Universitaet Freiburg
 # 
-# Version:      0.0.2b
+# Version:      0.0.2c
 
 # empty functions are defined at the beginning of /etc/functions
 
@@ -264,7 +264,7 @@ devices\n# during vmware sessions. If you like to remove certain modules \
 add them\n# to the list below - Dirk von Suchodoletz, <dirk@goe.net>\n\
 STATE=1\nps aux|grep -i vmware|grep -v \"grep\" &>/dev/null && { STATE=0; \
 /sbin/rmmod usb-storage &>/tmp/null; }\n\
-[ x$ACTION = xremove ] && { [ $STATE = 0 ] && /sbin/rmmod usb-storage \
+[ x\$ACTION = xremove ] && { [ \$STATE = 0 ] && /sbin/rmmod usb-storage \
 &>/dev/null; }\nexit \$STATE" > /mnt/var/X11R6/bin/vm-udev
 chmod u+x /mnt/var/X11R6/bin/vm-udev
 echo -e "# special entry to block linux from reacting to usb events during \
diff --git a/initrd/distro-specs/suse/functions-10.0 b/initrd/distro-specs/suse/functions-10.0
index 06887d7e..3dac8704 100644
--- a/initrd/distro-specs/suse/functions-10.0
+++ b/initrd/distro-specs/suse/functions-10.0
@@ -3,7 +3,7 @@
 #               changes should be done there, version specific changes for
 #               the 10.0 here.
 #
-# Author(s):    Dirk von Suchodoletz <dirk@goe.net>, 24-06-2006
+# Author(s):    Dirk von Suchodoletz <dirk@goe.net>, 08-07-2006
 #
 # Copyright:    (c) 2006 - RZ Universitaet Freiburg
 # 
@@ -46,7 +46,7 @@ devices\n# during vmware sessions. If you like to remove certain modules \
 add them\n# to the list below - Dirk von Suchodoletz, <dirk@goe.net>\n\
 STATE=1\nps aux|grep -i vmware|grep -v \"grep\" &>/dev/null && { STATE=0; \
 /sbin/rmmod usb-storage &>/tmp/null; }\n\
-[ x$ACTION = xremove ] && { [ $STATE = 0 ] && /sbin/rmmod usb-storage \
+[ x\$ACTION = xremove ] && { [ \$STATE = 0 ] && /sbin/rmmod usb-storage \
 &>/dev/null; }\nexit \$STATE" >> /mnt/var/X11R6/bin/vm-udev
 chmod u+x /mnt/var/X11R6/bin/vm-udev
 echo -e "# special entry to block linux from reacting to usb events during \
diff --git a/initrd/distro-specs/suse/functions-10.1 b/initrd/distro-specs/suse/functions-10.1
index 8e085348..f52f0924 100644
--- a/initrd/distro-specs/suse/functions-10.1
+++ b/initrd/distro-specs/suse/functions-10.1
@@ -3,11 +3,11 @@
 #               General changes should be done there, version specific 
 #               changes for the 10.1 here.
 #
-# Author(s):    Dirk von Suchodoletz <dirk@goe.net>, 26-06-2006
+# Author(s):    Dirk von Suchodoletz <dirk@goe.net>, 08-07-2006
 #
 # Copyright:    (c) 2006 - RZ Universitaet Freiburg
 # 
-# Version:      0.3.0a
+# Version:      0.3.0b
 
 # some specific stuff to initialize
 preinit () {
@@ -64,7 +64,7 @@ devices\n# during vmware sessions. If you like to remove certain modules \
 add them\n# to the list below - Dirk von Suchodoletz, <dirk@goe.net>\n\
 STATE=1\nps aux|grep -i vmware|grep -v \"grep\" &>/dev/null && { STATE=0; \
 /sbin/rmmod usb-storage &>/tmp/null; }\n\
-[ x$ACTION = xremove ] && { [ $STATE = 0 ] && /sbin/rmmod usb-storage \
+[ x\$ACTION = xremove ] && { [ \$STATE = 0 ] && /sbin/rmmod usb-storage \
 &>/dev/null; }\nexit \$STATE" >> /mnt/var/X11R6/bin/vm-udev
 chmod u+x /mnt/var/X11R6/bin/vm-udev
 echo -e "# special entry to block linux from reacting to usb events during \
diff --git a/initrd/distro-specs/ubuntu/functions-5.10 b/initrd/distro-specs/ubuntu/functions-5.10
index c47270b0..925b25a7 100644
--- a/initrd/distro-specs/ubuntu/functions-5.10
+++ b/initrd/distro-specs/ubuntu/functions-5.10
@@ -3,13 +3,13 @@
 #               ramdisk after genconfig) - overwrites settings from the
 #               ubuntu default file (functions-default)
 #
-# Author(s):    Dirk von Suchodoletz <dirk@goe.net>, 23-06-2006
+# Author(s):    Dirk von Suchodoletz <dirk@goe.net>, 08-07-2006
 #               Nico Dietrich
 #               Felix Endres
 #
 # Copyright:    (c) 2006 - RZ Universitaet Freiburg
 # 
-# Version:      0.3.0a
+# Version:      0.3.0b
 
 <<<<<<< .mine
 # distro specific stuff to initialize
@@ -354,7 +354,7 @@ devices\n# during vmware sessions. If you like to remove certain modules \
 add them\n# to the list below - Dirk von Suchodoletz, <dirk@goe.net>\n\
 STATE=1\nps aux|grep -i vmware|grep -v \"grep\" &>/dev/null && { STATE=0; \
 /sbin/rmmod usb-storage &>/tmp/null; }\n\
-[ x$ACTION = xremove ] && { [ $STATE = 0 ] && /sbin/rmmod usb-storage \
+[ x\$ACTION = xremove ] && { [ \$STATE = 0 ] && /sbin/rmmod usb-storage \
 &>/dev/null; }\nexit \$STATE" > /mnt/var/X11R6/bin/vm-udev
 chmod u+x /mnt/var/X11R6/bin/vm-udev
 echo -e "# special entry to block linux from reacting to usb events during \
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
diff --git a/initrd/mkdxsinitrd b/initrd/mkdxsinitrd
index 884099b3..1f18fe0e 100755
--- a/initrd/mkdxsinitrd
+++ b/initrd/mkdxsinitrd
@@ -3,7 +3,7 @@
 # Description:  universal (distro independent) generator for initial
 #               ramdisks for linux diskless clients 
 #
-# Author(s):    Dirk von Suchodoletz <dirk@goe.net>, 04-07-2006
+# Author(s):    Dirk von Suchodoletz <dirk@goe.net>, 08-07-2006
 #               Nico Dietrich
 #               Felix Endres
 #
@@ -406,6 +406,7 @@ case "${DISTRO}" in
         DISTRO_VER=10.1
       ;;
     esac
+
   ;;
 esac
 # at this point ${DISTRO} ${DISTRO_VER} should be fixed
@@ -423,6 +424,8 @@ mknod ${INSTDIR}/tmp/console c 5 1 &>/dev/null
 mknod ${INSTDIR}/tmp/null c 1 3 &>/dev/null
 mknod ${INSTDIR}/tmp/kmsg c 1 11 &>/dev/null
 mknod ${INSTDIR}/tmp/ctl b 241 255 &>/dev/null
+# suse specific, but might be usable with other distros too
+mknod ${INSTDIR}/tmp/bootsplash p &>/dev/null
 
 # test for the existance of busybox
 if [ "$use_busybox" = 1 ]; then