Heavy cleanup, proper variable assignement for D_XORGBIN (instead of

XBinPath in displayvars), bugfix ...


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

2 files changed, 35 insertions, 4 deletions

diff --git a/initramfs/distro-specs/debian/config-default b/initramfs/distro-specs/debian/config-default
index 009fe754..1bf3759b 100644
--- a/initramfs/distro-specs/debian/config-default
+++ b/initramfs/distro-specs/debian/config-default
@@ -1,9 +1,15 @@
-# Description:  distro specific general settings for Debian/Sarge
+# Copyright (c) 2003 - 2006 - RZ Uni Freiburg
+# Copyright (c) 2006, 2007 - OpenSLX GmbH
 #
-# Author(s):    Dirk von Suchodoletz <dirk@goe.net>, 23-06-2006
-#               Felix Endres
+# This program/file is free software distributed under the GPL version 2.
+# See http://openslx.org/COPYING
 #
-# Copyright:    (c) 2003, 2006 - RZ Universitaet Freiburg
+# If you have any feedback please consult http://openslx.org/feedback and
+# send your feedback to feedback@openslx.org
+#
+# General information about OpenSLX can be found under http://openslx.org
+#
+# Distro specific general settings for Debian/Sarge
 
 # D_SYSCONFDIR - system wide configuration settings - /etc/sysconfig in SuSE 
 # and RedHat, /etc/default in Debian and Ubuntu
@@ -18,6 +24,7 @@
 # D_RCDIRS - runlevel directories relative to /etc
 # D_XF86CONFFILE - name and location of XFree/Xorg config file, e.g.
 # /etc/X11/xorg.conf or /etc/X11/XF86config, ...
+# D_XORGBIN - name of XFree/Xorg server with absolute path
 # D_XFONTPATH - path(es) where X11 fonts are installed (with trailing /*)
 # D_DEFAULTCOUNTRY - localization (see common functions)
 # D_HWMODTOIGNORE - hardware modules which should not tried to load (because
@@ -45,5 +52,6 @@ D_INITDEFAULT="3"
 # via boot.ld (see hwautocfg)
 D_INITSCRIPTS="mountvirtfs udev procps.sh bootlogd keymap.sh hwclock.sh sudo dbus-1"
 D_XF86CONFFILE="/etc/X11/xorg.conf"
+D_XORGBIN=/usr/X11R6/bin/X
 D_XFONTPATH="/usr/X11R6/lib/X11/fonts/*"
 D_DEFAULTCOUNTRY="de"
diff --git a/initramfs/distro-specs/debian/functions-default b/initramfs/distro-specs/debian/functions-default
index b1b4022f..2fd8de7f 100644
--- a/initramfs/distro-specs/debian/functions-default
+++ b/initramfs/distro-specs/debian/functions-default
@@ -281,3 +281,26 @@ PROGRAM=\"/var/X11R6/bin/vm-udev\", OPTIONS=\"ignore_device\"\n\
 SUBSYSTEM==\"usb\", ACTION==\"remove\", PROGRAM=\"/var/X11R6/bin/vm-udev\"" \
   >> /mnt/etc/udev/rules.d/01-udev-vm.rules
 }
+
+# overwrite settings set by hwautocfg, pathes will change for newer
+# Xorg version 7.X
+displayvars (){
+Files=' \t        FontPath\t\t       "/usr/share/X11/fonts/misc"\n
+\t        FontPath\t\t    "/usr/share/X11/fonts/100dpi/:unscaled"\n
+\t        FontPath\t\t    "/usr/share/X11/fonts/75dpi/:unscaled"\n
+\t        FontPath\t\t    "/usr/share/X11/fonts/Type1"\n
+\t        FontPath\t\t    "/usr/share/X11/fonts/100dpi"\n
+\t        FontPath\t\t    "/usr/share/X11/fonts/75dpi"\n
+'
+Module=' \t        Load\t           "i2c"\n
+\t        Load\t            "bitmap"\n
+\t        Load\t            "ddc"\n
+\t        Load\t            "dri"\n
+\t        Load\t            "extmod"\n
+\t        Load\t            "freetype"\n
+\t        Load\t            "glx"\n
+\t        Load\t            "int10"\n
+\t        Load\t            "type1"\n
+\t        Load\t            "vbe"\n'
+synapticsdrv=""
+}