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

18 files changed, 131 insertions, 67 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=""
+}
diff --git a/initramfs/distro-specs/gentoo/config-default b/initramfs/distro-specs/gentoo/config-default
index 90dd5337..2275c685 100644
--- a/initramfs/distro-specs/gentoo/config-default
+++ b/initramfs/distro-specs/gentoo/config-default
@@ -21,6 +21,7 @@
 # TempFS usage
 # D_DIRINDXS - directories in client filesystem which should be present 
 # anyhow
+# D_XORGBIN - name of XFree/Xorg server with absolute path
 # D_RCDIRS - runlevel directories relative to /etc
 # D_HWMODTOIGNORE - hardware modules which should not tried to load (because
 # already in kernel, nonexistent, ...)
@@ -43,8 +44,8 @@ D_INITDEFAULT="3"
 D_RCDIRS="/runlevels/default /runlevels/single /runlevels/nonetwork"
 D_INITSCRIPTS="localmount keymaps clock urandom"
 D_XF86CONFFILE="/etc/X11/xorg.conf"
+D_XORGBIN=/usr/bin/Xorg
 D_XFONTPATH="/usr/share/fonts/*"
 D_DEFAULTCOUNTRY="de"
 D_HWMODTOIGNORE="i8xx-tco ichxrom snd-atiixp-modem intel-rng"
 D_BOOTLOCAL="conf.d/local.start"
-
diff --git a/initramfs/distro-specs/gentoo/functions-default b/initramfs/distro-specs/gentoo/functions-default
index 5da5bd68..9fb025fd 100644
--- a/initramfs/distro-specs/gentoo/functions-default
+++ b/initramfs/distro-specs/gentoo/functions-default
@@ -406,4 +406,5 @@ InputDevice='\tIdentifier\t"Keyboard1"\n
 \tOption\t\t"XkbModel"\t\t"pc105"\n
 \tOption\t\t"XkbOptions"\t\t"lv3:ralt_switch"\n
 \tOption\t\t"XkbVariant"\t\t"nodeadkeys"'
+synapticsdrv="/usr/lib/xorg/modules/input/synaptics_drv.o"
 }
diff --git a/initramfs/distro-specs/suse/config-10.1 b/initramfs/distro-specs/suse/config-10.1
index 46efb1f1..aba27fc6 100644
--- a/initramfs/distro-specs/suse/config-10.1
+++ b/initramfs/distro-specs/suse/config-10.1
@@ -25,6 +25,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_BOOTLOCAL - script for user specified stuff which should be started
diff --git a/initramfs/distro-specs/suse/config-10.2 b/initramfs/distro-specs/suse/config-10.2
index ae296900..1b35c21f 100644
--- a/initramfs/distro-specs/suse/config-10.2
+++ b/initramfs/distro-specs/suse/config-10.2
@@ -24,6 +24,7 @@
 # D_BINDMNT - any code which is specific in bind mount environment
 # D_RCDIRS - runlevel directories relative to /etc
 # D_XF86CONFFILE - name and location of XFree/Xorg config file, e.g.
+# D_XORGBIN - name of XFree/Xorg server with absolute path
 # /etc/X11/xorg.conf or /etc/X11/XF86config, ...
 # D_XFONTPATH - path(es) where X11 fonts are installed (with trailing /*)
 # D_DEFAULTCOUNTRY - localization (see common functions)
@@ -35,3 +36,4 @@ boot.sysctl boot.ipconfig boot.swap"
 D_RODIRSINRW="/etc/opt/gnome/gconf /var/adm /var/lib/texmf /var/lib/rpm \
 /var/cache/fontconfig"
 D_HWMODTOIGNORE="i8xx-tco ichxrom snd-atiixp-modem intel-rng pata_atiixp"
+D_XORGBIN=/usr/bin/Xorg
diff --git a/initramfs/distro-specs/suse/config-default b/initramfs/distro-specs/suse/config-default
index 66f1cc2c..94fbac4e 100644
--- a/initramfs/distro-specs/suse/config-default
+++ b/initramfs/distro-specs/suse/config-default
@@ -25,6 +25,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
@@ -55,6 +56,7 @@ D_RCDIRS="/init.d/rc0.d /init.d/rc1.d /init.d/rc2.d /init.d/rc3.d \
 D_INITSCRIPTS="boot.udev boot.proc boot.shm boot.klog boot.loadmodules \
 boot.clock boot.sysctl boot.ipconfig boot.swap"
 D_XF86CONFFILE="/etc/X11/xorg.conf"
+D_XORGBIN=/usr/X11R6/bin/Xorg
 D_XFONTPATH="/usr/X11R6/lib/X11/fonts/*"
 D_DEFAULTCOUNTRY="de"
 D_HWMODTOIGNORE="i8xx-tco ichxrom snd-atiixp-modem intel-rng"
diff --git a/initramfs/distro-specs/suse/functions-10.2 b/initramfs/distro-specs/suse/functions-10.2
index 55864f93..47ce5b19 100644
--- a/initramfs/distro-specs/suse/functions-10.2
+++ b/initramfs/distro-specs/suse/functions-10.2
@@ -245,6 +245,5 @@ Files='\tModulePath\t"/etc/X11/modules"\n
 \tFontPath\t"/usr/share/fonts/misc/:unscaled"\n
 \tFontPath\t"/usr/share/fonts/75dpi/:unscaled"\n
 \tFontPath\t"/usr/share/fonts/100dpi/:unscaled"'
-# where to link /var/X11R6/bin/X too
-XBinPath=/usr/bin/Xorg
+synapticsdrv="/usr/lib/xorg/modules/input/synaptics_drv.so"
 }
diff --git a/initramfs/distro-specs/suse/functions-default b/initramfs/distro-specs/suse/functions-default
index 0aff34cc..71792e04 100644
--- a/initramfs/distro-specs/suse/functions-default
+++ b/initramfs/distro-specs/suse/functions-default
@@ -1,15 +1,18 @@
+# Copyright (c) 2003 - 2006 - RZ Uni Freiburg
+# Copyright (c) 2006, 2007 - OpenSLX GmbH
+#
+# This program/file is free software distributed under the GPL version 2.
+# See http://openslx.org/COPYING
+#
+# 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
+#
 # configuration script for general SuSE to configure linux diskless clients 
 # (included by init, hwautocfg, servconfig within initial ramdisk after 
 # inclusion of the main functions file). This file is the main base for the
 # several SuSE distro versions
-#
-# this file is distributed under the GPLv2, see ~/openslx/COPYING
-#
-# Dirk von Suchodoletz <dvs@OpenSLX.com>, 22-12-2006
-# mj0 09-11-2006
-#
-# (c) 2006 - RZ Universitaet Freiburg
-# (c) 2006 OpenSLX GmbH
 
 # empty functions are defined at the beginning of /etc/functions
 
@@ -146,9 +149,10 @@ if [ "x$start_snmp" = "xyes" ] ; then
 config_dm_entry () {
 local dm="$1"  
 # should be stated that entries were made (fixmee how??)
+# autologin is defined some other way ...
+#    -e "s,.*_AUTOLOGIN.*,DISPLAYMANAGER_AUTOLOGIN=\"\"," \
 sed -e "s,DISPLAYMANAGER=.*,DISPLAYMANAGER=\"$start_xdmcp\"," \
     -e "s,.*_XSERVER.*,DISPLAYMANAGER_STARTS_XSERVER=\"$dm\"," \
-    -e "s,.*_AUTOLOGIN.*,DISPLAYMANAGER_AUTOLOGIN=\"\"," \
     -i /mnt/etc/${D_SYSCONFDIR}/displaymanager
 # start the display manager as early as possible, but avoid that it is
 # started twice during bootup ... late_dm can postpone the start of 
@@ -470,8 +474,7 @@ rerun\n# the mkdxsinitrd script to get them applied\n\
 esac
 }
 
-# Xorg variable settings. chance to overwrite settings in hwautocfg for
-# xorg.conf
+# Xorg variable settings. Lots of stuff changes for newer Xorg servers
 displayvars () {
-XBinPath=/usr/X11R6/bin/Xorg
+synapticsdrv="/usr/X11R6/lib/modules/input/synaptics_drv.o"
 }
diff --git a/initramfs/distro-specs/ubuntu/config-5.10 b/initramfs/distro-specs/ubuntu/config-5.10
index 4b9f1fec..de94c79d 100644
--- a/initramfs/distro-specs/ubuntu/config-5.10
+++ b/initramfs/distro-specs/ubuntu/config-5.10
@@ -1,10 +1,16 @@
-# Description:  distro specific settings for Ubuntu Hoary Hedgehog (5.10)
-#               defaults are taken from config-default file
+# Copyright (c) 2003 - 2006 - RZ Uni Freiburg
+# Copyright (c) 2006, 2007 - OpenSLX GmbH
 #
-# Author(s):    Dirk von Suchodoletz <dirk@goe.net>, 23-06-2006
+# 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 settings for Ubuntu Hoary Hedgehog (5.10) defaults are
+# taken from config-default file
 
 # D_SYSCONFDIR - system wide configuration settings - /etc/sysconfig in SuSE 
 # and RedHat, /etc/default in Debian and Ubuntu
@@ -20,6 +26,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
diff --git a/initramfs/distro-specs/ubuntu/config-6.06 b/initramfs/distro-specs/ubuntu/config-6.06
index a75090a1..a875a319 100644
--- a/initramfs/distro-specs/ubuntu/config-6.06
+++ b/initramfs/distro-specs/ubuntu/config-6.06
@@ -1,10 +1,16 @@
-# Description:  distro specific settings for Ubuntu Dapper Dake (6.06)
-#               defaults are taken from config-default file
+# Copyright (c) 2003 - 2006 - RZ Uni Freiburg
+# Copyright (c) 2006, 2007 - OpenSLX GmbH
 #
-# Author(s):    Dirk von Suchodoletz <dirk@goe.net>, 23-06-2006
+# 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 settings for Ubuntu Dapper Dake (6.06) defaults are
+# taken from config-default file
 
 # D_SYSCONFDIR - system wide configuration settings - /etc/sysconfig in SuSE 
 # and RedHat, /etc/default in Debian and Ubuntu
@@ -20,6 +26,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
diff --git a/initramfs/distro-specs/ubuntu/config-6.10 b/initramfs/distro-specs/ubuntu/config-6.10
index f9de9967..babbfe07 100644
--- a/initramfs/distro-specs/ubuntu/config-6.10
+++ b/initramfs/distro-specs/ubuntu/config-6.10
@@ -1,10 +1,16 @@
-# Description:  distro specific settings for Ubuntu Dapper Dake (6.06)
-#               defaults are taken from config-default file
+# Copyright (c) 2003 - 2006 - RZ Uni Freiburg
+# Copyright (c) 2006, 2007 - OpenSLX GmbH
 #
-# Author(s):    Dirk von Suchodoletz <dirk@goe.net>, 23-06-2006
+# 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 settings for Ubuntu Dapper Dake (6.10) defaults are taken
+# from config-default file
 
 # D_SYSCONFDIR - system wide configuration settings - /etc/sysconfig in SuSE 
 # and RedHat, /etc/default in Debian and Ubuntu
@@ -20,6 +26,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
diff --git a/initramfs/distro-specs/ubuntu/config-default b/initramfs/distro-specs/ubuntu/config-default
index 24096b19..0a7ac7ee 100644
--- a/initramfs/distro-specs/ubuntu/config-default
+++ b/initramfs/distro-specs/ubuntu/config-default
@@ -1,9 +1,16 @@
-# Description:  distro specific default settings for Ubuntu - might be
-#               merged/taken from Debian config-default
+# Copyright (c) 2003 - 2006 - RZ Uni Freiburg
+# Copyright (c) 2006, 2007 - OpenSLX GmbH
 #
-# Author(s):    Dirk von Suchodoletz <dirk@goe.net>, 23-06-2006
+# 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 default settings for Ubuntu - might be merged/taken from
+# Debian config-default
 
 # D_SYSCONFDIR - system wide configuration settings - /etc/sysconfig in SuSE 
 # and RedHat, /etc/default in Debian and Ubuntu
@@ -21,6 +28,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
@@ -49,6 +57,7 @@ D_RCDIRS="/rc0.d /rc1.d /rc2.d /rc3.d /rc4.d /rc5.d /rc6.d"
 D_INITDEFAULT="3"
 D_INITSCRIPTS="mountvirtfs keymap.sh procps.sh bootlogd hwclock.sh sudo"
 D_XF86CONFFILE="/etc/X11/xorg.conf"
+D_XORGBIN=/usr/X11R6/bin/X
 D_XFONTPATH="/usr/share/fonts/*"
 D_DEFAULTCOUNTRY="de"
 D_BOOTLOCAL=""
diff --git a/initramfs/distro-specs/ubuntu/functions-default b/initramfs/distro-specs/ubuntu/functions-default
index 07c20101..5c0de1b5 100644
--- a/initramfs/distro-specs/ubuntu/functions-default
+++ b/initramfs/distro-specs/ubuntu/functions-default
@@ -46,7 +46,7 @@ Module=' \t        Load\t	    "i2c"\n
 \t        Load\t	    "int10"\n
 \t        Load\t	    "type1"\n
 \t        Load\t	    "vbe"\n'
-
+synapticsdrv=""
 }
 # distro specific function called from servconfig script
 config_distro () {
diff --git a/initramfs/initrd-stuff/bin/hwautocfg b/initramfs/initrd-stuff/bin/hwautocfg
index 47c53c45..5125b311 100755
--- a/initramfs/initrd-stuff/bin/hwautocfg
+++ b/initramfs/initrd-stuff/bin/hwautocfg
@@ -22,7 +22,6 @@ local xfc=$1
 local HSYNCRANGE="31.5-63.5"
 local VSYNCRANGE="60-90"
 local DEFAULTMODES='"1024x768" "800x600" "640x480"'
-local DEFAULTCOLORDPT=24
 # set variables representing the xorg.conf sections (version 6.9.x)
 # variables might be overwritten via displayvars function
 local Module='\tLoad\t\t"dbe"\n
@@ -76,7 +75,7 @@ local Device='\tIdentifier\t"StdGraphics"\n
 local Screen='\tIdentifier\t"Screen 1"\n
 \tDevice\t\t"StdGraphics"\n
 \tMonitor\t\t"Default"\n
-\tDefaultColorDepth CDP'
+\tDefaultColorDepth 24'
 local ServerLayout='\tIdentifier\t"Simple Layout"\n
 \tScreen\t\t"Screen 1"\n
 \tInputDevice\t"Keyboard1"\t"CoreKeyboard"\n
@@ -88,30 +87,27 @@ local ServerLayout='\tIdentifier\t"Simple Layout"\n
 local DRI='\tGroup\t\t"video"\n
 \tMode\t\t0666'
 
-# displayvars may overwrite the above settings
+# displayvars may overwrite the above settings and define pathes below e.g.
+# synapticsdrv
 displayvars
 
 # run localizator and configure X11 keyboard
 localization "${country}"
 if [ -z "${XKEYBOARD}" ] ; then
-  error "$hcfg_keyb" nonfatal
+  error "${hcfg_keyb}" nonfatal
   XKEYBOARD="de"
 fi
 
 # check if hardware definition variables are set and overwrite autodetected
 # values
-if [ -n "$hw_graphic" ] ; then
+if [ -n "${hw_graphic}" ] ; then
   DRV=${hw_graphic% *}
-  CDP=${hw_graphic##* }
-  if [ -z "$DRV" ] ; then error "$hcfg_gfxdrv" nonfatal
+  if [ -z "$DRV" ] ; then error "${hcfg_gfxdrv}" nonfatal
     XMODULE=vesa
   fi
 fi
-if [ -z "$CDP" ] ; then error "$hcfg_gfxcdp" nonfatal
-  CDP=${DEFAULTCOLORDPT}
-fi
 
-if [ -n "$hw_monitor" ] ; then
+if [ -n "${hw_monitor}" ] ; then
   # just cut all starting from k(Hz) ...
   HS=${hw_monitor%k*}
   VS=${hw_monitor%Hz*}
@@ -198,18 +194,17 @@ for section in Files ServerFlags Module InputDevice Monitor \
       # if special synaptics touchpad was detected and specific driver
       # is present
       if strinfile "synaptics" /tmp/hwsetup.info && \
-        test -e /mnt/usr/X11R6/lib/modules/input/synaptics_drv.o ; then
+        test -e /mnt/${synapticsdrv} ; then
 	echo -e $InputMouseSyn >>$xfc
       else
         echo -e $InputMouseDef >>$xfc
       fi
     ;;
     Screen)
-      echo -e ${Screen} | sed -e "s,CDP,${CDP}," >>$xfc
+      echo -e ${Screen} >>$xfc
       for BPP in 15 16 24
         do echo -e '\tSubSection "Display"\n\t\tDepth\t'\
           $BPP'\n\t\tModes\t'$SCR_MODES'\n\tEndSubSection' >>$xfc
-        [ $BPP = "$CDP" ] && break
       done
     ;;
     ServerLayout)
@@ -467,7 +462,7 @@ fi
 if [ -f /rootfs${D_XF86CONFFILE#/mnt} ] ; then
   echo "ready" > /tmp/xready
 else
-  . /etc/sysconfig/xserver >/dev/null 2>&1 || error "$hcfg_hwsetup" nonfatal
+  . /etc/sysconfig/xserver >/dev/null 2>&1 || error "${hcfg_hwsetup}" nonfatal
   ( displaysetup /etc/xorg.conf; echo "ready" > /tmp/xready ) &
 fi
   
@@ -525,4 +520,3 @@ case $1 in
     echo "hwsetup finished at $(sysup)" > /tmp/hwcfg
   ;;
 esac
-
diff --git a/initramfs/initrd-stuff/bin/servconfig b/initramfs/initrd-stuff/bin/servconfig
index 13bf01ee..08c36931 100755
--- a/initramfs/initrd-stuff/bin/servconfig
+++ b/initramfs/initrd-stuff/bin/servconfig
@@ -1,4 +1,3 @@
-#!/bin/sh
 # Copyright (c) 2003 - 2006 - RZ Uni Freiburg
 # Copyright (c) 2006, 2007 - OpenSLX GmbH
 #
@@ -456,7 +455,6 @@ $date\n*\n%hostlist\t$x_display_manager\n*\t\tCHOOSER %hostlist"\
 
   # define type of X session
   dsx="no"
-  init="#7:5:respawn:/usr/X11R6/bin/X vt7 -quiet"
   case "$start_x" in
     yes|YES|direct|DIRECT|query|QUERY)
       # direct connection onto the own displaymanager, which
@@ -466,19 +464,20 @@ $date\n*\n%hostlist\t$x_display_manager\n*\t\tCHOOSER %hostlist"\
       dsx="yes"
       xdmcp="false"
       echo -e "# /etc/X11/Xservers - file generated by \
-$0: $date\n:0 local /usr/X11R6/bin/X :0 vt07\n" >/mnt/etc/X11/xdm/Xservers
+$0: $date\n:0 local X :0 vt07\n" >/mnt/etc/X11/xdm/Xservers
     ;;
     broadcast|BROADCAST)
       # the client will XDMCP broadcast and choose first available
       # X11 server
-      [ "x$start_xdmcp" = "xgdm" ] || init="$init -broadcast"
+      [ "x$start_xdmcp" = "xgdm" ] || \
+        init="7:5:respawn:${D_XORGBIN} vt7 -quiet -broadcast"
     ;;
     indirect|INDIRECT)
       # the client will try to XDMCP connect list of X11 servers
       if [ "x$start_xdmcp" = "xgdm" ] ; then
         init=""
       else
-        init="$init -indirect $host_name"
+        init="7:5:respawn:${D_XORGBIN} vt7 -quiet -indirect $host_name"
       fi
       [ "x$start_xdmcp" = "xno" ] && start_xdmcp="yes"
       xdmcp="true"
@@ -508,11 +507,11 @@ resmgr revoke nobody\nresmgr logout tty7\nkillall X" \
     ;;
   esac
   echo -e "# entry made by $0 $date\n$init" >> /mnt/etc/inittab
-  displayvars
-  if [ -n $XBinPath ] ; then
-    testmkd /mnt/var/X11R6/bin
-    ln -sf $XBinPath /mnt/var/X11R6/bin/X
-  fi
+  # most probably not needed any longer
+  #if [ -n ${D_XORGBIN} ] ; then
+  #  testmkd /mnt/var/X11R6/bin
+  #  ln -sf ${D_XORGBIN} /mnt/var/X11R6/bin/X
+  #fi
 fi
 
 # setup requested display manager
diff --git a/initramfs/mkdxsinitrd b/initramfs/mkdxsinitrd
index 38d1622f..1237d97f 100755
--- a/initramfs/mkdxsinitrd
+++ b/initramfs/mkdxsinitrd
@@ -50,6 +50,7 @@ D_RCDIRS="<set in ~/distro-config/distro file>"
 D_RCDIRSINRW="<set in ~/distro-config/distro file>"
 D_INITSCRIPTS="<set in ~/distro-config/distro file>"
 D_XF86CONFFILE="<set in ~/distro-config/distro file>"
+D_XORGBIN="<set in ~/distro-config/distro file>"
 D_XFONTPATH="<set in ~/distro-config/distro file>"
 D_DEFAULTCOUNTRY="<set in ~/distro-config/distro file>"
 # read in the global settings
diff --git a/installer/ld4-inst b/installer/ld4-inst
index 5a6bcbe3..af12dcf8 100755
--- a/installer/ld4-inst
+++ b/installer/ld4-inst
@@ -443,7 +443,7 @@ ${rootdir} ${netname}/${netmask}(ro,no_root_squash,async)" \
   declare -i j=0
   while [ $j -lt ${#choice[@]} ] ; do
     current_kernel=${kernel[${choice[$j]}]#${rootdir}/boot/vmlinuz-}
-    current_initramfs=${tftpbootdir}/initrd-dxs-${current_kernel}
+    current_initramfs=initrd-dxs-${current_kernel}
 
     if [ $j -eq 0 ] ; then
       default_string="  MENU DEFAULT\n"
@@ -454,9 +454,9 @@ ${rootdir} ${netname}/${netmask}(ro,no_root_squash,async)" \
     # last (needed only for loading with pxelinux)
     echo -e "LABEL ${client_distro}-${current_kernel}\n${default_string}\
   MENU LABEL $j. ${client_distro}-${client_distro_ver} ${current_kernel} Diskless\n\
-  KERNEL ${server}::${tftpbootdir}/vmlinuz-${current_kernel}\n\
+  KERNEL ${server}::vmlinuz-${current_kernel}\n\
   APPEND rootfs=nfs://${server}${rootdir} apic dhcp noldsc debug=$debuglevel vci=DXS \
-  initrd=${server}::${tftpbootdir}/initrd-dxs-${current_kernel} \n\
+  initrd=${server}::initrd-dxs-${current_kernel} \n\
   ipappend 1\n" >> ${dxs_conf}/${dxs_pxedefault_conf}-${timestamp}
 
     if isyes "$nbdyes" ; then
@@ -464,9 +464,9 @@ ${rootdir} ${netname}/${netmask}(ro,no_root_squash,async)" \
       # create configs for nbd/squashfs kernels too
       echo -e "LABEL ${client_distro}-${current_kernel}-nbd\n\
   MENU LABEL $j. ${client_distro}-${client_distro_ver} ${current_kernel} Diskless NBD\n\
-  KERNEL ${server}::${tftpbootdir}/vmlinuz-${current_kernel}\n\
+  KERNEL ${server}::vmlinuz-${current_kernel}\n\
   APPEND rootfs=nbd://${server}:5000/${nbdfs} apic dhcp noldsc debug=$debuglevel elevator=\"noop\" vci=DXS \
-  initrd=${server}::${tftpbootdir}/initrd-dxs-${current_kernel}\n\
+  initrd=${server}::initrd-dxs-${current_kernel}\n\
   ipappend 1\n" >> ${dxs_conf}/${dxs_pxedefault_conf}-${timestamp}
     fi