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 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'initrd/initrd-stuff/etc/functions') 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 , 26-06-2006 +# Author(s): Dirk von Suchodoletz , 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 /functions-default & ~-version # overwrite xorg configuration set by hwautocfg displayvars (){ -- cgit v1.2.3-55-g7522