6 files changed, 41 insertions, 17 deletions
diff --git a/initramfs/distro-specs/debian/config-default b/initramfs/distro-specs/debian/config-default
index 2f1d638d..009fe754 100644
--- a/initramfs/distro-specs/debian/config-default
+++ b/initramfs/distro-specs/debian/config-default
@@ -27,8 +27,7 @@ D_SYSCONFDIR=/default
 D_ETCEXCL="etc/gconf/*\n*.old\n*-\n\
 etc/autoinstall\nlogrotate*\nbootloader\n*~\n\
 pptp.d\nisdn\nyouservers\nhardware/hwcfg*\n\
-X11/xdm/pixmaps\ndhclient.script\n\
-rc2.d/*\nrc5.d/*"
+X11/xdm/pixmaps\ndhclient.script"
 D_BINDMPTS="tmp root home"
 D_DIRINBINDMNT="/var/run /var/log /var/tmp /var/lib/gdm /etc/X11"
 D_RODIRSINRW="etc/gconf etc/X11/xkb /var/adm /var/lib/texmf"
diff --git a/initramfs/distro-specs/suse/config-10.2 b/initramfs/distro-specs/suse/config-10.2
index 7229f9c7..f85815f1 100644
--- a/initramfs/distro-specs/suse/config-10.2
+++ b/initramfs/distro-specs/suse/config-10.2
@@ -24,5 +24,6 @@
 # D_BOOTLOCAL - script for user specified stuff which should be started
 # during client bootup, path and file relative to /etc
 
-D_INITSCRIPTS="kbd boot.udev boot.proc boot.klog boot.loadmodules boot.clock boot.sysctl boot.ipconfig boot.swap"
+D_INITSCRIPTS="boot.udev boot.proc boot.klog boot.loadmodules boot.clock boot.sysctl boot.ipconfig boot.swap"
 D_RODIRSINRW="/etc/opt/gnome/gconf /etc/X11/xkb /var/adm /var/lib/texmf /var/lib/rpm /var/cache/fontconfig"
+D_HWMODTOIGNORE="i8xx-tco ichxrom snd-atiixp-modem intel-rng pata_atiixp"
diff --git a/initramfs/distro-specs/suse/config-default b/initramfs/distro-specs/suse/config-default
index ce6b365a..890cdccd 100644
--- a/initramfs/distro-specs/suse/config-default
+++ b/initramfs/distro-specs/suse/config-default
@@ -1,10 +1,16 @@
-# Description:  distro specific settings for general SuSE. This configuration
-#               is the base for following SuSE versions
+# Copyright (c) 2003 - 2006 - RZ Uni Freiburg
+# Copyright (c) 2006, 2007 - OpenSLX GmbH
 #
-# Author(s):    Dirk von Suchodoletz <dvs@openslx.com>, 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 general SuSE. This configuration is the base
+# for following SuSE versions: 9.3 - 10.2
 
 # D_SYSCONFDIR - system wide configuration settings - /etc/sysconfig in SuSE 
 # and RedHat, /etc/default in Debian and Ubuntu
@@ -30,8 +36,7 @@ D_SYSCONFDIR=/sysconfig
 D_ETCEXCL="opt/gnome/gconf/*\n*.old\n*-\n*.rpmorig\n*.rpmnew\n\
 *.YaST2save\netc/autoinstall\nlogrotate*\nbootloader\n*~\n\
 *.SuSEconfig.saved\npptp.d\nisdn\nyouservers\nhardware/hwcfg*\n\
-X11/xdm/pixmaps\n*.rpmsave\ndhclient*script\ninit.d/boot.d/*\n\
-init.d/rc3.d/*\ninit.d/rc5.d/*\nX11/xorg.conf*\n"
+X11/xdm/pixmaps\n*.rpmsave\ndhclient*script\nX11/xorg.conf*\n"
 D_BINDMPTS="tmp root media home"
 D_DIRINBINDMNT="/var/run /var/log /var/tmp"
 D_RODIRSINRW="/etc/opt/gnome/gconf /etc/X11/xkb /var/adm /var/lib/texmf \
diff --git a/initramfs/distro-specs/suse/functions-10.2 b/initramfs/distro-specs/suse/functions-10.2
index f4a23adf..cff4b24f 100644
--- a/initramfs/distro-specs/suse/functions-10.2
+++ b/initramfs/distro-specs/suse/functions-10.2
@@ -1,11 +1,17 @@
+# 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 functions for SuSE 10.2 which differ from functions defined
 # in general SuSE base definitions ...  General changes should be done there,
 # version specific changes for the 10.2 go here.
-#
-# Dirk von Suchodoletz <dvs@OpenSLX.com>, 14-12-2006
-#
-# (c) 2006 - RZ Universitaet Freiburg
-# (c) 2006 - OpenSLX.ORG Project
 
 # some specific stuff to initialize
 preinit () {
@@ -24,6 +30,7 @@ done
 echo -e "#!$shell\n:" >/usr/sbin/alsactl
 rm /etc/udev/rules.d/60-persistent-storage.rules 2>/dev/null
 chmod u+x /sbin/* /lib/udev/* /usr/sbin/*
+echo -e "disk:x:6:\nlp:x:7:\nkmem:x:9:\nvideo:x:33:" > /etc/group
 }
 
 # udev service
@@ -112,12 +119,17 @@ sed -e "/wanted keytable/,/^fi$/d;/load usb drivers/,/^esac$/d" \
   -i /mnt/etc/${D_INITDIR}/kbd
 sed -e "s,KEYTABLE=.*,KEYTABLE=\"${KEYTABLE}\"," \
   -i /mnt/etc/${D_SYSCONFDIR}/keyboard
+#echo -e "\tloadkeys ${KEYTABLE} >${LOGFILE} 2>&1\n" \
+#  >>/mnt/etc/${D_INITDIR}/boot.ld
+rllinker kbd "01" "20"
 }
 
 # consolefont and language (function run in hwautocfg)
 consolefont () {
 sed -e "s,RC_LANG=.*,RC_LANG=\"${LANG}\" # added in initrd," \
     -i /mnt/etc/${D_SYSCONFDIR}/language
+#echo -e "\tsetfont ${CONSOLE_FONT} >${LOGFILE} 2>&1\n" \
+#  >>/mnt/etc/${D_INITDIR}/boot.ld
 }
 
 # check the glx and tvout stuff and configure it
@@ -176,4 +188,6 @@ 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
 }
diff --git a/initramfs/distro-specs/suse/functions-default b/initramfs/distro-specs/suse/functions-default
index cf23e8f4..33de9b6c 100644
--- a/initramfs/distro-specs/suse/functions-default
+++ b/initramfs/distro-specs/suse/functions-default
@@ -560,3 +560,9 @@ rerun\n# the mkdxsinitrd script to get them applied\n\
   ;;
 esac
 }
+
+# Xorg variable settings. chance to overwrite settings in hwautocfg for
+# xorg.conf
+displayvars () {
+XBinPath=/usr/X11R6/bin/Xorg
+}
diff --git a/initramfs/distro-specs/ubuntu/config-default b/initramfs/distro-specs/ubuntu/config-default
index c0ee7c42..24096b19 100644
--- a/initramfs/distro-specs/ubuntu/config-default
+++ b/initramfs/distro-specs/ubuntu/config-default
@@ -32,8 +32,7 @@ D_SYSCONFDIR=/default
 D_ETCEXCL="etc/gconf/*\n*.old\n*-\n\
 etc/autoinstall\nlogrotate*\nbootloader\n*~\n\
 pptp.d\nisdn\nyouservers\nhardware/hwcfg*\n\
-X11/xdm/pixmaps\ndhclient.script\n\
-rc2.d/*\nrc5.d/*"
+X11/xdm/pixmaps\ndhclient.script"
 D_BINDMPTS="tmp root home"
 D_DIRINBINDMNT="/var/run /var/log /var/tmp /var/lib/gdm"
 D_RODIRSINRW="/etc/X11/xkb /var/lib/gconf /var/lib/dpkg /var/lib/aspell /var/lib/pango /var/lib/defoma"