6 files changed, 67 insertions, 27 deletions
diff --git a/initramfs/distro-specs/gentoo/config-2006.1 b/initramfs/distro-specs/gentoo/config-2006.1
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/initramfs/distro-specs/gentoo/config-2006.1
diff --git a/initramfs/distro-specs/gentoo/config-default b/initramfs/distro-specs/gentoo/config-default
index 2bae4d17..90dd5337 100644
--- a/initramfs/distro-specs/gentoo/config-default
+++ b/initramfs/distro-specs/gentoo/config-default
@@ -1,8 +1,15 @@
-# Description:  distro specific settings for Gentoo 2005.1
+# Copyright (c) 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) 2005,6 - 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
+#
+# general distro specific settings for Gentoo
 
 # D_SYSCONFDIR - system wide configuration settings in /etc - sysconfig in  
 # SuSE and RedHat, default in Debian and Ubuntu, conf.d in Gentoo
@@ -20,4 +27,24 @@
 # D_BOOTLOCAL - script for user specified stuff which should be started 
 # during client bootup, path and file relative to /etc
 
-# nothing changed yet
+D_SYSCONFDIR=/conf.d
+D_ETCEXCL="opt/gnome/gconf/*\n*.old\n*-\nbootloader\n*~\n\
+pptp.d\nisdn\nX11/xdm/pixmaps\ndhclient*script\nxorg.conf.*"
+D_BINDMPTS="tmp root home"
+D_DIRINBINDMNT="/var/run /var/log /var/tmp"
+D_RODIRSINRW="/etc/gconf /etc/splash"
+D_DIRINDXS="/var/run/xauth /var/lib/init.d/started /var/lib/init.d/starting \
+/var/lib/init.d/daemons /var/lib/nobody \
+/var/lib/texmf /var/lib/nfs/sm \
+/var/lib/misc /var/lib/acpi /var/spool/cron /var/lock/subsys"
+D_INITDIR="/init.d"
+D_INITBOOTD="/runlevels/boot"
+D_INITDEFAULT="3"
+D_RCDIRS="/runlevels/default /runlevels/single /runlevels/nonetwork"
+D_INITSCRIPTS="localmount keymaps clock urandom"
+D_XF86CONFFILE="/etc/X11/xorg.conf"
+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-2006.1 b/initramfs/distro-specs/gentoo/functions-2006.1
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/initramfs/distro-specs/gentoo/functions-2006.1
diff --git a/initramfs/distro-specs/gentoo/functions-default b/initramfs/distro-specs/gentoo/functions-default
index d926ed17..b8eba655 100644
--- a/initramfs/distro-specs/gentoo/functions-default
+++ b/initramfs/distro-specs/gentoo/functions-default
@@ -36,39 +36,50 @@ else error "$df_errudev" nonfatal
 fi
 }
 
-# linking runlevel scripts
+# linking runlevel scripts and defining execution order
 rllinker () {
 local script="$1"
 local after="$2"
 # empty runlevel links - decision on running certain services is
 # passed via configuration
-ln -s /etc/${D_INITDIR}/$1 /mnt/etc/runlevels/default/$1
-#echo $1 >> /mnt/etc/runlevels/default/.critical
-# same stuff as within initial_boot
-# [ -n "$after" ] &&
+if strinstr "$1" " ${D_INITSCRIPTS} " ; then
+  ln -s /etc/${D_INITDIR}/$1 /mnt/etc/runlevels/boot/$1
+  echo $1 >> /mnt/etc/runlevels/boot/.critical
+else
+  ln -s /etc/${D_INITDIR}/$1 /mnt/etc/runlevels/default/$1
+  echo $1 >> /mnt/etc/runlevels/default/.critical
+fi
+if [ -n "$after" ] ; then
+  sedscript "$after"
+  sed -f /tmp/sedscript -i /mnt/etc/${D_INITDIR}/$1
+else
+  sed "/depend/,/}/d" -i /mnt/etc/${D_INITDIR}/$1
+fi
 }
 
+# sed script writer
+sedscript () {
+echo -e "/depend/,/}/{\n/^[[:space:]]/d\n/depend/i\\" >/tmp/sedscript
+echo -e "# modified within initial ramfs/stage3\n/depend/a\\" >>/tmp/sedscript
+echo -e "\tafter $1\n}" >> /tmp/sedscript
+}
+
+
 # setup initial boot scripts (rather strange concept I did not get 
 # completely)
 initial_boot () {
-#rm /mnt/etc/runlevels/*/.critical 2>/dev/null
-for i in ${D_INITSCRIPTS}; do
+local after=""
+local script
+for script in ${D_INITSCRIPTS}; do
   ln -sf /etc${D_INITDIR}/$i /mnt/etc/${D_INITBOOTD}/$i
   # to get a certain order of scripts the after token of depends () might be
   # used
-  # [ -n "$after" ] && \
-  #  sedscript:
-   #/depend/,/}/{
-   #/^ /d
-   #/depend/a\
-   #\tafter $bla
-   #}
-  #after=$i
-  #sed -f sedscript -i /etc${D_INITDIR}/$i
-  # not needed any more
-  #echo $i >> /mnt/etc/${D_INITBOOTD}/.critical
-  #echo $i >> /mnt/etc/runlevels/default/.critical
+  echo "Linking $script"
+  rllinker "$script" "$after"
+  after=$script
 done
+# avoid the bullshit of "system initialization"
+sed -e "s/# System init.*//;s/si::.*//" -i /mnt/etc/inittab
 }
 
 # initialize boot.ld - skript to be executed during early system startup
@@ -175,7 +186,6 @@ if [ -f /mnt/etc/${D_INITDIR}/xdm ] ; then
   sed -e "s,DISPLAYMANAGER=.*,DISPLAYMANAGER=\"xdm\"," -i /mnt/etc/rc.conf
   ln -s /etc/${D_INITDIR}/xdm /mnt/etc/runlevels/boot/xdm
   ln -s /etc/${D_INITDIR}/xdm /mnt/etc/runlevels/default/xdm
-  echo "xdm" >> /mnt/etc/runlevels/boot/.critical
 fi
 }
 
@@ -230,8 +240,6 @@ config_rc_entry "CONSOLEFONT" "${CONSOLE_FONT}"
 # acpi and powersave
 config_acpi () {
 rllinker acpid
-# remove dependencies (runs unneeded services ...)
-sed "/depend/,/}/d" -i /mnt/etc/${D_INITDIR}/acpid
 }
 
 # configure automounter
diff --git a/initramfs/initrd-stuff/etc/functions b/initramfs/initrd-stuff/etc/functions
index 83611be6..e3a06a4b 100644
--- a/initramfs/initrd-stuff/etc/functions
+++ b/initramfs/initrd-stuff/etc/functions
@@ -1137,3 +1137,8 @@ config_portmap () {
 config_nis () {
 :
 }
+
+# konfigure keyboard layout
+keytable () {
+:
+}
diff --git a/initramfs/mkdxsinitrd b/initramfs/mkdxsinitrd
index 5c0735de..f5c6d4f0 100755
--- a/initramfs/mkdxsinitrd
+++ b/initramfs/mkdxsinitrd
@@ -450,7 +450,7 @@ case "${DISTRO}" in
       2005*)
         DISTRO_VER=2005.1
       ;;
-	  2006*|*)
+      2006*|*)
         DISTRO_VER=2006.1
       ;;
     esac