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

5 files changed, 47 insertions, 17 deletions

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 () {