* merged branch 'initramfs-ng' back intro trunk - requires careful testing ...

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

15 files changed, 84 insertions, 642 deletions

diff --git a/initramfs/distro-specs/ubuntu/README-ubuntu b/initramfs/distro-specs/ubuntu/README-ubuntu
deleted file mode 100644
index 319c9e84..00000000
--- a/initramfs/distro-specs/ubuntu/README-ubuntu
+++ /dev/null
@@ -1,16 +0,0 @@
-fehler kubuntu 6.06:
-
-distro-functions: line 43: udevstert not found
-	-laut changelog von udev wird behaupted, dass man udevstart nicht mehr braucht.. -> Ja und da wir mdev von busybox machen, wird in Stage3 KEIN udev mehr
-benötigt! (dsuchod)
-
-
-module unix not found -> im kernel
-anderer pfad in xorg.conf:
-fonts in /urs/share/X11/fonts + module pfad löschen
-
-bei livecd: cannot create dir /media/loop0 readonly!
-kioskmode deaktivieren + kdm start
-inittab anpassen! + konsole1 macht immer timeout auch wenn sich keiner anmeldet
-ACHTUNG: bei kdm root anmeldung ohne pw möglich!
-
diff --git a/initramfs/distro-specs/ubuntu/config-5.10 b/initramfs/distro-specs/ubuntu/config-5.10
deleted file mode 100644
index de94c79d..00000000
--- a/initramfs/distro-specs/ubuntu/config-5.10
+++ /dev/null
@@ -1,37 +0,0 @@
-# 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
-#
-# 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
-# D_ETCEXCL - list of files, wildcards to be excluded from /etc when using 
-# bind mounts
-# D_DIRINBINDMNT - lists of directories to be created in bind mounted rw
-# part of the client filesystem
-# D_RODIRSINRW - ReadOnly Directories in RW part of filesystem to save on 
-# TempFS usage
-# D_DIRINDXS - directories in client filesystem which should be present 
-# anyhow
-# 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.
-# /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
-# already in kernel, nonexistent, ...)
-# D_BOOTLOCAL - script for user specified stuff which should be started
-# during client bootup, path and file relative to /etc
-
-# no changes from default:
diff --git a/initramfs/distro-specs/ubuntu/config-6.06 b/initramfs/distro-specs/ubuntu/config-6.06
deleted file mode 100644
index a875a319..00000000
--- a/initramfs/distro-specs/ubuntu/config-6.06
+++ /dev/null
@@ -1,37 +0,0 @@
-# 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
-#
-# 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
-# D_ETCEXCL - list of files, wildcards to be excluded from /etc when using 
-# bind mounts
-# D_DIRINBINDMNT - lists of directories to be created in bind mounted rw
-# part of the client filesystem
-# D_RODIRSINRW - ReadOnly Directories in RW part of filesystem to save on 
-# TempFS usage
-# D_DIRINDXS - directories in client filesystem which should be present 
-# anyhow
-# 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.
-# /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
-# already in kernel, nonexistent, ...)
-# D_BOOTLOCAL - script for user specified stuff which should be started
-# during client bootup, path and file relative to /etc
-
-# no changes from default
diff --git a/initramfs/distro-specs/ubuntu/config-6.10 b/initramfs/distro-specs/ubuntu/config-6.10
deleted file mode 100644
index c0fa2c0d..00000000
--- a/initramfs/distro-specs/ubuntu/config-6.10
+++ /dev/null
@@ -1,42 +0,0 @@
-# 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
-#
-# 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
-# D_ETCEXCL - list of files, wildcards to be excluded from /etc when using 
-# bind mounts
-# D_DIRINBINDMNT - lists of directories to be created in bind mounted rw
-# part of the client filesystem
-# D_RODIRSINRW - ReadOnly Directories in RW part of filesystem to save on 
-# TempFS usage
-# D_DIRINDXS - directories in client filesystem which should be present 
-# anyhow
-# 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.
-# /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
-# already in kernel, nonexistent, ...)
-# D_BOOTLOCAL - script for user specified stuff which should be started
-# during client bootup, path and file relative to /etc
-
-# mountvirtfs does not exist anymore -> use mountkernfs.sh
-D_INITSCRIPTS="mountkernfs.sh keyboard-setup mountdevsubfs.sh procps.sh bootlogd hwclock.sh sudo console-setup $D_SPLASHY"
-D_ETCEXCL="*.old\n*-\n\
-etc/autoinstall\nlogrotate*\nbootloader\n*~\n\
-pptp.d\nisdn\nyouservers\nhardware/hwcfg*\n\
-X11/xdm/pixmaps\ndhclient.script"
diff --git a/initramfs/distro-specs/ubuntu/config-7.04 b/initramfs/distro-specs/ubuntu/config-7.04
deleted file mode 100644
index abe88150..00000000
--- a/initramfs/distro-specs/ubuntu/config-7.04
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright (c) 2003 - 2007 - 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
-#
-# Distro specific settings for Ubuntu Feisty Fawn (7.04) 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
-# D_ETCEXCL - list of files, wildcards to be excluded from /etc when using 
-# bind mounts
-# D_DIRINBINDMNT - lists of directories to be created in bind mounted rw
-# part of the client filesystem
-# D_RODIRSINRW - ReadOnly Directories in RW part of filesystem to save on 
-# TempFS usage
-# D_DIRINDXS - directories in client filesystem which should be present 
-# anyhow
-# 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.
-# /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
-# already in kernel, nonexistent, ...)
-# D_BOOTLOCAL - script for user specified stuff which should be started
-# during client bootup, path and file relative to /etc
-
-# Aus 6.10:
-# mountvirtfs does not exist anymore -> use mountkernfs.sh
-D_ETCEXCL="*.old\n*-\n etc/autoinstall\nlogrotate*\nbootloader\n*~\n\
-pptp.d\nisdn\nyouservers\nhardware/hwcfg*\n\
-X11/xdm/pixmaps\ndhclient.script"
-D_RODIRSINRW="/etc/X11/xkb /var/lib/gconf /var/lib/dpkg /var/lib/aspell \
-/var/lib/pango /var/lib/defoma /var/cache/fontconfig"
-D_INITSCRIPTS="mountkernfs.sh keyboard-setup mountdevsubfs.sh procps.sh \
-bootlogd hwclock.sh sudo console-setup $D_SPLASHY"
-
diff --git a/initramfs/distro-specs/ubuntu/config-7.10 b/initramfs/distro-specs/ubuntu/config-7.10
deleted file mode 100644
index 8a565ee6..00000000
--- a/initramfs/distro-specs/ubuntu/config-7.10
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright (c) 2003 - 2007 - 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
-#
-# Distro specific settings for Ubuntu Gutsy Gibbon (7.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
-# D_ETCEXCL - list of files, wildcards to be excluded from /etc when using 
-# bind mounts
-# D_DIRINBINDMNT - lists of directories to be created in bind mounted rw
-# part of the client filesystem
-# D_RODIRSINRW - ReadOnly Directories in RW part of filesystem to save on 
-# TempFS usage
-# D_DIRINDXS - directories in client filesystem which should be present 
-# anyhow
-# 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.
-# /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
-# already in kernel, nonexistent, ...)
-# D_BOOTLOCAL - script for user specified stuff which should be started
-# during client bootup, path and file relative to /etc
-
-# D_INITDEFAULT is obsolete with the change to upstart in 7.10 
-
-D_ETCEXCL="*.old\n*-\n etc/autoinstall\nlogrotate*\nbootloader\n*~\n\
-pptp.d\nisdn\nyouservers\nhardware/hwcfg*\n\
-X11/xdm/pixmaps\ndhclient.script"
-D_RODIRSINRW="/etc/X11/xkb /var/lib/gconf /var/lib/dpkg /var/lib/aspell \
-/var/lib/pango /var/lib/defoma /var/cache/fontconfig"
-D_INITSCRIPTS="mountkernfs.sh keyboard-setup mountdevsubfs.sh procps.sh \
-bootlogd hwclock.sh sudo console-setup $D_SPLASHY"
diff --git a/initramfs/distro-specs/ubuntu/config-8.04 b/initramfs/distro-specs/ubuntu/config-8.04
deleted file mode 100644
index 8a565ee6..00000000
--- a/initramfs/distro-specs/ubuntu/config-8.04
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright (c) 2003 - 2007 - 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
-#
-# Distro specific settings for Ubuntu Gutsy Gibbon (7.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
-# D_ETCEXCL - list of files, wildcards to be excluded from /etc when using 
-# bind mounts
-# D_DIRINBINDMNT - lists of directories to be created in bind mounted rw
-# part of the client filesystem
-# D_RODIRSINRW - ReadOnly Directories in RW part of filesystem to save on 
-# TempFS usage
-# D_DIRINDXS - directories in client filesystem which should be present 
-# anyhow
-# 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.
-# /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
-# already in kernel, nonexistent, ...)
-# D_BOOTLOCAL - script for user specified stuff which should be started
-# during client bootup, path and file relative to /etc
-
-# D_INITDEFAULT is obsolete with the change to upstart in 7.10 
-
-D_ETCEXCL="*.old\n*-\n etc/autoinstall\nlogrotate*\nbootloader\n*~\n\
-pptp.d\nisdn\nyouservers\nhardware/hwcfg*\n\
-X11/xdm/pixmaps\ndhclient.script"
-D_RODIRSINRW="/etc/X11/xkb /var/lib/gconf /var/lib/dpkg /var/lib/aspell \
-/var/lib/pango /var/lib/defoma /var/cache/fontconfig"
-D_INITSCRIPTS="mountkernfs.sh keyboard-setup mountdevsubfs.sh procps.sh \
-bootlogd hwclock.sh sudo console-setup $D_SPLASHY"
diff --git a/initramfs/distro-specs/ubuntu/config-default b/initramfs/distro-specs/ubuntu/config-default
deleted file mode 100644
index 246192f6..00000000
--- a/initramfs/distro-specs/ubuntu/config-default
+++ /dev/null
@@ -1,65 +0,0 @@
-# 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
-#
-# 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
-# D_ETCEXCL - list of files, wildcards to be excluded from /etc when using 
-# bind mounts
-# D_DIRINBINDMNT - lists of directories to be created in bind mounted rw
-# part of the client filesystem
-# D_RODIRSINRW - ReadOnly Directories in RW part of filesystem to save on 
-# D_RWDIRSINRO - Writable Subdirectories in the RO-Dirs (D_RODIRSINRW)  
-# TempFS usage
-# D_DIRINDXS - directories in client filesystem which should be present 
-# anyhow
-# D_BINDMNT - any code which is specific in bind mount environment
-# D_BINDMPTS - These directories will be created in the ramdisk and movemounted
-# to the root ("/") this will also happen to /var and /etc
-# 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
-# already in kernel, nonexistent, ...)
-# D_BOOTLOCAL - script for user specified stuff which should be started
-# during client bootup, path and file relative to /etc
-
-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"
-D_BINDMPTS="tmp root home media"
-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"
-#D_RWDIRSINRO="/var/lib/gdm"
-D_DIRINDXS="/var/X11R6/compose-cache \
-/var/run/sysconfig/tmp /var/adm /var/lib/rpm /var/lib/nobody \
-/var/lib/pam_devperm /var/lib/bluetooth \
-/var/lib/texmf /var/lib/nfs/sm \
-/var/lib/misc /var/lib/acpi /var/spool/cron \
-/var/lock/subsys/sysconfig"
-D_INITDIR="/init.d"
-D_INITBOOTD="/rcS.d"
-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_SPLASHY"
-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-5.10 b/initramfs/distro-specs/ubuntu/functions-5.10
deleted file mode 100644
index 70b8fb1e..00000000
--- a/initramfs/distro-specs/ubuntu/functions-5.10
+++ /dev/null
@@ -1,72 +0,0 @@
-# configuration script for Ubuntu V5.10 to configure OpenSLX linux diskless
-# clients (merged in stage2 with ubuntu/functions-default - and loaded within
-# initial ramfs - stage3) It may overwrite settings from the default config 
-# file (/etc/functions)
-#
-# Dirk von Suchodoletz <dvs@OpenSLX.com>, 31-08-2006
-# Nico Dietrich
-# Felix Endres
-#
-# (c) 2006 - RZ Universitaet Freiburg
-# (c) 2006 - OpenSLX.ORG Project
-
-
-# syslog service
-config_syslog () {
-if [ "x$start_syslog" = "xyes" ] ; then
-  echo -e "# /etc/syslog.conf - file generated by $0" >/mnt/etc/syslogd.conf
-  echo "kern.warn;*.err;authpriv.none\t/dev/tty10\n\
-#kern.warn;*.err;authpriv.none\t|/dev/xconsole\n\
-#*.emerg\n\n*.=warn;*.=err\t\t\t-/var/log/warn\n\
-#*.crit\t\t\t\t/var/log/warn\n*.*;mail.none;news.none\t\t\
-#-/var/log/messages" >> /mnt/etc/syslogd.conf
-#  test -n "$log_servers" && \
-#  for logserver in $log_servers; do
-#       echo -e "*.*;*.*;*.*;*kern.!*\t@$logserver" >>/mnt/etc/syslog.conf
-#  done
-  rllinker "sysklogd" "02" "18"
-fi
-}
-
-# secure shell service
-config_sshd () {
-if [ "x$start_sshd" = "xyes" ] ; then
-  if [ -f /mnt/etc/init.d/ssh ] ; then
-    #testmkd /mnt/var/run/sshd
-    rllinker "ssh" "12" "10"
-  else
-    error "$df_errsshd" nonfatal
-  fi
-fi
-}
-
-# snmp agent for remote monitoring
-config_snmp () {
-if [ "x$start_snmp" = "xyes" ] ; then
-  if [ -f /mnt/etc/init.d/snmpd ] ; then
-    rllinker "snmpd" "24" "02"
-    testmkd /mnt/var/lib/net-snmp >/dev/null 2>&1
-  fi
-    # fixme!!
-    # write service monitor depending on services started
-fi
-}
-
-# consolefont
-consolefont () {
-echo -e "setfont ${CONSOLE_FONT} >${LOGFILE} 2>&1" \
-  >>/mnt/etc/${D_INITDIR}/boot.slx
-}
-# acpi and powersave
-config_acpi () {
-  rllinker "acpid" "02" "19"
-  rllinker "acpi-support" "20" "02"
-}
-
-# configure hal, dbus, resmgr and services like that
-# fixme: complete or remove (dummy function is present in /etc/functions)
-config_dreshal () {
-if [ "x$start_dreshal" = "xyes" ]; then
-  :
-fi
-}
diff --git a/initramfs/distro-specs/ubuntu/functions-6.06 b/initramfs/distro-specs/ubuntu/functions-6.06
deleted file mode 100644
index ca9eed98..00000000
--- a/initramfs/distro-specs/ubuntu/functions-6.06
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright (c) 2003 - 2006 - RZ Uni Freiburg
-# Copyright (c) 2006, 2007 - OpenSLX GmbH
-#
-# This program 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 at http://openslx.org
-#
-# Configuration script for Ubuntu V6.06 to configure OpenSLX linux stateless
-# clients (merged in stage2 with ubuntu/functions-default - and loaded within
-# initial ramfs - stage3). It may overwrite settings from the default config
-# file (/etc/functions)
-
-# distro specific stuff to initialize
-preinit () {
-  echo "Creating dhcp user"
-  echo "dhcp:x:101:">>/etc/group
-  echo "dhcp:x:101:101::/nonexistent:/bin/false" >>/etc/passwd
-  # mount/unionfs can not handle the nfsro parameter in Ubuntu 6.06 
-  NFSRO=""
-}
-
-# set up keytable (function run in hwautocfg)
-# fixme: is anything needed here - otherwise remove (and check that a 
-# dummy function is present)
-keytable () {
-# fixme -- use keytable setup script here
-:
-}
-
-# consolefont and language
-consolefont () {
-[ "$LANG" == "de_DE@euro" ] && LANG=de_DE.UTF8
-sed -e "s,LANGUAGE=.*,LANGUAGE=${LANG},;s,LANG=.*,LANG=${LANG}," \
-    -i /mnt/etc/environment
-rllinker "console-screen.sh" 31 3
-}
diff --git a/initramfs/distro-specs/ubuntu/functions-6.10 b/initramfs/distro-specs/ubuntu/functions-6.10
deleted file mode 100644
index 76808347..00000000
--- a/initramfs/distro-specs/ubuntu/functions-6.10
+++ /dev/null
@@ -1,52 +0,0 @@
-# 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 Ubuntu 6.10 to configure OpenSLX linux stateless
-# clients (merged in stage2 with ubuntu/functions-default - and loaded within
-# initial ramfs - stage3) It may overwrite settings from the default config
-# file (/etc/functions)
-
-# distro specific stuff to initialize
-preinit () {
-  echo "Creating dhcp user"
-  echo "dhcp:x:101:">>/etc/group
-  echo "dhcp:x:101:101::/nonexistent:/bin/false" >>/etc/passwd
-  # mount/unionfs can not handle the nfsro parameter in Ubuntu 6.06 
-  NFSRO=""
-}
-
-# distro specific function called from servconfig script
-config_distro () {
-# add the halt link to the 0 and 6 runlevel directories
-  ln -sf ../init.d/halt /mnt/etc/rc0.d/S90halt
-  ln -sf ../init.d/reboot /mnt/etc/rc6.d/S90reboot
-  sed -i '/halt.*-i/s/ -i / /' /mnt/etc/init.d/halt  
-  # set default runlevel
-  # how that is done for upstart??
-}
-
-
-# set up keytable (function run in hwautocfg)
-# fixme: is anything needed here - otherwise remove (and check that a 
-# dummy function is present)
-keytable () {
-# fixme -- use keytable setup script here
-:
-}
-
-# consolefont and language
-consolefont () {
-[ "$LANG" == "de_DE@euro" ] && LANG=de_DE.UTF8
-sed -e "s,LANGUAGE=.*,LANGUAGE=${LANG},;s,LANG=.*,LANG=${LANG}," \
-    -i /mnt/etc/environment
-rllinker "console-screen.sh" 31 3
-}
-
diff --git a/initramfs/distro-specs/ubuntu/functions-7.04 b/initramfs/distro-specs/ubuntu/functions-7.04
deleted file mode 100644
index 1a4678ee..00000000
--- a/initramfs/distro-specs/ubuntu/functions-7.04
+++ /dev/null
@@ -1,16 +0,0 @@
-# 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 Ubuntu 7.04 to configure OpenSLX linux stateless
-# clients (merged in stage2 with ubuntu/functions-default - and loaded within
-# initial ramfs - stage3) It may overwrite settings from the default config
-# file (/etc/functions)
-
diff --git a/initramfs/distro-specs/ubuntu/functions-7.10 b/initramfs/distro-specs/ubuntu/functions-7.10
deleted file mode 100644
index 479b58a0..00000000
--- a/initramfs/distro-specs/ubuntu/functions-7.10
+++ /dev/null
@@ -1,35 +0,0 @@
-# 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 Ubuntu 7.04 to configure OpenSLX linux stateless
-# clients (merged in stage2 with ubuntu/functions-default - and loaded within
-# initial ramfs - stage3) It may overwrite settings from the default config
-# file (/etc/functions)
-
-# distro specific function called from servconfig script
-config_distro () {
-  # add the halt link to the 0 and 6 runlevel directories
-  ln -sf ../init.d/halt /mnt/etc/rc0.d/S90halt
-  ln -sf ../init.d/reboot /mnt/etc/rc6.d/S90reboot
-  
-  # remove annoying udev rule set for changing eth interface
-  rm /mnt/etc/udev/rules.d/*persistent-net.rules >/dev/null 2>&1
-
-  # inittab is obsolete with the change to upstart in ubuntu 7.10, but to 
-  # prevent missunderstandings with the blank inittab created by openslx init
-  # we'll write a comment.. 
-  echo "# inittab is obsolete with the change to upstart in ubuntu 7.10" > /mnt/etc/inittab
-
-  # fix getty bug
-  # (console login on tty1 is started too early)
-  sed -i "s/start on runlevel 2/start on stopped rc2/" /mnt/etc/event.d/tty1
-}
-
diff --git a/initramfs/distro-specs/ubuntu/functions-8.04 b/initramfs/distro-specs/ubuntu/functions-8.04
index 479b58a0..c50f9d41 100644
--- a/initramfs/distro-specs/ubuntu/functions-8.04
+++ b/initramfs/distro-specs/ubuntu/functions-8.04
@@ -1,5 +1,5 @@
-# Copyright (c) 2003 - 2006 - RZ Uni Freiburg
-# Copyright (c) 2006, 2007 - OpenSLX GmbH
+# 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
@@ -9,27 +9,9 @@
 #
 # General information about OpenSLX can be found under http://openslx.org
 #
-# Configuration script for Ubuntu 7.04 to configure OpenSLX linux stateless
+# Configuration script for Ubuntu 8.04 configure OpenSLX linux stateless
 # clients (merged in stage2 with ubuntu/functions-default - and loaded within
 # initial ramfs - stage3) It may overwrite settings from the default config
 # file (/etc/functions)
 
-# distro specific function called from servconfig script
-config_distro () {
-  # add the halt link to the 0 and 6 runlevel directories
-  ln -sf ../init.d/halt /mnt/etc/rc0.d/S90halt
-  ln -sf ../init.d/reboot /mnt/etc/rc6.d/S90reboot
-  
-  # remove annoying udev rule set for changing eth interface
-  rm /mnt/etc/udev/rules.d/*persistent-net.rules >/dev/null 2>&1
-
-  # inittab is obsolete with the change to upstart in ubuntu 7.10, but to 
-  # prevent missunderstandings with the blank inittab created by openslx init
-  # we'll write a comment.. 
-  echo "# inittab is obsolete with the change to upstart in ubuntu 7.10" > /mnt/etc/inittab
-
-  # fix getty bug
-  # (console login on tty1 is started too early)
-  sed -i "s/start on runlevel 2/start on stopped rc2/" /mnt/etc/event.d/tty1
-}
-
+# no changes from default
diff --git a/initramfs/distro-specs/ubuntu/functions-default b/initramfs/distro-specs/ubuntu/functions-default
index 81eb5188..caddbfd4 100644
--- a/initramfs/distro-specs/ubuntu/functions-default
+++ b/initramfs/distro-specs/ubuntu/functions-default
@@ -1,5 +1,5 @@
-# Copyright (c) 2003 - 2006 - RZ Uni Freiburg
-# Copyright (c) 2006, 2007 - OpenSLX GmbH
+# Copyright (c) 2003..2006 - RZ Uni Freiburg
+# Copyright (c) 2006..2008 - OpenSLX GmbH
 #
 # This program/file is free software distributed under the GPL version 2.
 # See http://openslx.org/COPYING
@@ -12,13 +12,34 @@
 # Configuration script for general Ubuntu to configure OpenSLX linux
 # stateless clients (executed within initial ramdisk after genconfig) 
 
+# distro specific configuration variables used in the setup functions
+# (formerly done via config-*, these variables are disputable ...)
+# D_ETCEXCL - list of files, wildcards to be excluded from /etc when using 
+# bind mounts
+# D_DIRINBINDMNT - lists of directories to be created in bind mounted rw part
+# of the client filesystem
+# D_RODIRSINRW - ReadOnly Directories in RW part of filesystem to save on 
+# TempFS usage
+# D_DIRINDXS - directories in client filesystem which should be present anyhow
+D_ETCEXCL="etc/gconf/*\n*.old\n*-\netc/autoinstall\nlogrotate*\nbootloader\n\
+*~\npptp.d\nisdn\nyouservers\nhardware/hwcfg*\n\
+X11/xdm/pixmaps\ndhclient.script"
+D_BINDMPTS="tmp root home media"
+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 /var/cache/fontconfig"
+#D_RWDIRSINRO="/var/lib/gdm"
+D_DIRINDXS="/var/X11R6/compose-cache \
+/var/run/sysconfig/tmp /var/adm /var/lib/rpm /var/lib/nobody \
+/var/lib/pam_devperm /var/lib/bluetooth \
+/var/lib/texmf /var/lib/nfs/sm \
+/var/lib/misc /var/lib/acpi /var/spool/cron \
+/var/lock/subsys/sysconfig"
+
 # empty functions are defined at the beginning of /etc/functions
 
 # distro specific stuff to initialize
 preinit () {
-  [ $DEBUGLEVEL -ge 1 ] && echo "Creating dhcp user"
-  echo "dhcp:x:101:">>/etc/group
-  echo "dhcp:x:101:101::/nonexistent:/bin/false" >>/etc/passwd
   # load unix module to provide sockets (is compiled into kernel on
   # the live CDs!?)
   modprobe ${MODPRV} unix 2>/dev/null || error "$df_errumod" nonfatal
@@ -26,30 +47,12 @@ preinit () {
   modprobe ${MODPRV} fbcon 2>/dev/null || error "$df_errumod" nonfatal
 }
 
-# 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=""
-}
 # distro specific function called from servconfig script
 config_distro () {
+  # clean the runlevel directories which will be populated by the stage3 setup
+  for dir in rc0.d rc1.d rc2.d rc3.d rc4.d rc5.d rc6.d rcS.d ; do
+    rm -rf /mnt/etc/${dir}/*
+  done
   # add the halt link to the 0 and 6 runlevel directories
   ln -sf ../init.d/halt /mnt/etc/rc0.d/S90halt
   ln -sf ../init.d/reboot /mnt/etc/rc6.d/S90reboot
@@ -57,8 +60,29 @@ config_distro () {
   # remove annoying udev rule set for changing eth interface
   rm /mnt/etc/udev/rules.d/*persistent-net.rules >/dev/null 2>&1
 
-  # set default runlevel
-  sed -e "s/.*initdefault/id:${D_INITDEFAULT}:initdefault/" -i /mnt/etc/inittab
+  # inittab is obsolete with the change to upstart in ubuntu 7.10, but to 
+  # prevent missunderstandings with the blank inittab created by openslx init
+  # we'll write a comment.. 
+  echo "# inittab is obsolete with the change to upstart from ubuntu 7.10" \
+    > /mnt/etc/inittab
+
+  # fix getty bug
+  # (console login on tty1 is started too early)
+  sed -i "s/start on runlevel 2/start on stopped rc2/" /mnt/etc/event.d/tty1
+}
+
+# initial (boot time) runlevel scripts
+initial_boot () {
+local count=10
+# boot.slx is a special runlevel script generated within initialramfs which
+# should be executed before the normal runlevel scripts. Proper shutdown is
+# not needed!?
+for i in boot.slx mountkernfs.sh keyboard-setup mountdevsubfs.sh procps.sh \
+bootlogd hwclock.sh sudo console-setup $D_SPLASHY; do
+  count=$(($count + 1))
+  [ $DEBUGLEVEL -ge 2 ] && echo "boot-runlevelscript $i"
+  ln -sf /etc/init.d/$i /mnt/etc/rcS.d/S${count}$i
+done
 }
 
 # linking runlevel scripts
@@ -84,6 +108,15 @@ for i in rc2.d/K$stop$script rc3.d/K$stop$script \
 done
 }
 
+# set up localization like keytable, console
+dlocale () {
+# fixme -- use keytable setup script here
+# echo -e "\t# entries added by $0: $date" >> /mnt/etc/init.d/boot.slx
+sed "s/LANG.*/LANG=\"${LANG}\"/" -i /mnt/etc/default/locale
+#echo -e "\tsetfont ${CONSOLE_FONT} >${LOGFILE} 2>&1" \
+#  >>/mnt/etc/init.d/boot.slx
+}
+
 # group of functions for the normal runlevels - first parameter is start
 # second stop
 # function for ntp configuration
@@ -106,7 +139,7 @@ if [ "x$start_atd" = "xyes" ]; then
 fi
 }
 
-# function for configuration of cron services
+# function for configuration of cron services (fixme: to be moved to a plugin?)
 config_cron () {
 if [ "x$start_cron" = "xyes" ] ; then
   if [ -f /mnt/etc/init.d/cron ] ; then
@@ -123,7 +156,7 @@ if [ "x$start_cron" = "xyes" ] ; then
 fi
 }
 
-# syslog service
+# syslog service (available as a plugin, to be deleted here)
 config_syslog () {
 if [ "x$start_syslog" != "xno" ] ; then
 # fixme, welcher Syslog wird verwendet?
@@ -135,7 +168,7 @@ if [ "x$start_syslog" != "xno" ] ; then
 #       echo -e "*.*;*.*;*.*;*kern.!*\t@$logserver" >>/mnt/etc/syslog.conf
 #  done
 #else syslog-ng
-#  if [ -f /mnt/etc/${D_INITDIR}/syslog ] ; then
+#  if [ -f /mnt/etc/init.d/syslog ] ; then
 #    # logoutput depending on $start_syslog definitions
 #    sysngwriter /mnt/etc/syslog-ng/syslog-ng.conf
   rllinker "sysklogd" 2 18
@@ -168,18 +201,6 @@ if [ "x$start_snmp" = "xyes" ] ; then
   fi
 }
 
-# set up keytable (function run in hwautocfg)
-keytable () {
-# fixme -- use keytable setup script here
-:
-}
-
-# consolefont
-consolefont () {
-echo -e "\tsetfont ${CONSOLE_FONT} >${LOGFILE} 2>&1" \
-  >>/mnt/etc/${D_INITDIR}/boot.slx
-}
-
 # acpi and powersave
 config_acpi () {
   rllinker "acpid" 10 19
@@ -192,11 +213,14 @@ config_acpi () {
   rllinker "udev" 11 25
 }
 
-# configure hal, dbus, resmgr and services like that
+# configure hal, dbus, policykitd and services like that
 config_dreshal () {
 if [ "x$start_dreshal" = "xyes" ]; then
   testmkd /mnt/var/lib/dbus
-  rllinker "dbus" 17 20 
+  rllinker "dbus" 17 20
+
+  testmkd /mnt/var/lib/PolicyKit root:polkituser 1770
+  testmkd /mnt/var/lib/PolicyKit-public root:polkituser
 fi
 }
 
@@ -209,17 +233,17 @@ local name="$2"
 local info="$3"
 case "$switch" in
   init)
-    echo -e "#!/bin/sh\n# skeleton of /etc/${D_INITDIR}/$name written \
+    echo -e "#!/bin/sh\n# skeleton of /etc/init.d/$name written \
 from $0\n# after you applied changes to the creation scripts you have to \
 rerun\n# the mkdxsinitrd script to get them applied\n\n\
-. /lib/lsb/init-functions\n" >/mnt/etc/${D_INITDIR}/$name
+. /lib/lsb/init-functions\n" >/mnt/etc/init.d/$name
     echo -e "\n\ncase \"\$1\" in\n    start)\n\tlog_begin_msg \"$info\"" \
-      >>/mnt/etc/${D_INITDIR}/$name
-    chmod u+x /mnt/etc/${D_INITDIR}/$name
+      >>/mnt/etc/init.d/$name
+    chmod u+x /mnt/etc/init.d/$name
   ;;
   close)
     echo -e "\tlog_end_msg 0\n\t;;\n    stop)\n\t;;\nesac\nexit 0" \
-      >>/mnt/etc/${D_INITDIR}/$name
+      >>/mnt/etc/init.d/$name
   ;;
 esac
 }
@@ -227,25 +251,9 @@ esac
 # configure automounter
 config_automount () {
 if [ -f /mnt/etc/init.d/autofs ] ; then
-  testmkd /var/lock/subsys
-  echo -e "# /etc/auto.master - file generated by $0:\n\
-/misc\t/etc/auto.misc" >/mnt/etc/auto.master
-  echo -e "# /etc/auto.misc - file generated by $0:\n" \
-    > /mnt/etc/auto.misc
-  if [ -n "${automnt_src}" ] ; then
-    # local directory and home directory server from machine-setup
-    [ -z "${automnt_dir}" ] && automnt_dir="/home"
-    strinstr "/" "${automnt_dir}" && error "$df_erratpld" nonfatal
-    automnt_dir=${automnt_dir#/}
-    echo -e "/home\t/etc/auto.${automnt_dir}\n" >> /mnt/etc/auto.master
-    echo -e "# /etc/auto.${automnt_dir} created by $0:\n" \
-      > /mnt/etc/auto.${automnt_dir}
-    echo -e "*\t-rsize=32768,wsize=32768,tcp,rw\t${automnt_src}/&" \
-      >> /mnt/etc/auto.${automnt_dir}
-  fi
-  sed -e "1i# /etc/${D_SYSCONFDIR}/autofs - file modified by\n#\t$0:\n#" \
-      -e "s,AUTOFS_OPTIONS.*,AUTOFS_OPTIONS=\"--timeout 3\"," \
-      -i /mnt/etc/${D_SYSCONFDIR}/autofs
+  testmkd /mnt/var/lock/subsys
+  sed -e "1i# /etc/${default}/autofs - file modified by\n#\t$0:\n#" \
+      -e "s,TIMEOUT.*,TIMEOUT=60," -i /mnt/etc/default/autofs
   config_portmap
   rllinker "autofs" 12 4
 fi
@@ -257,12 +265,12 @@ if [ "x$start_nfsv4" = "xyes" ]; then
   testmkd /mnt/var/lib/nfs/sm
   sed -e "s,NEED_IDMAPD=.*,NEED_IDMAPD=\"yes\"," \
       -e "s,NEED_GSSD=.*,NEED_GSSD=\"yes\"," \
-      -i /mnt/etc/${D_SYSCONFDIR}/nfs-common
+      -i /mnt/etc/${default}/nfs-common
   echo -e "rpc_pipefs\t/var/lib/nfs/rpc_pipefs rpc_pipefs defaults\t 0 0\n\
 nfsd\t\t/proc/fs/nfsd\tnfsd\t\tdefaults\t 0 0" >>/tmp/fstab
 echo -e "\t# stuff needed for nfsv4\n\tmount -t rpc_pipefs rpc_pipefs \
 /var/lib/nfs/rpc_pipefs\n\tmount -t nfsd nfsd /proc/fs/nfsd" \
->>/mnt/etc/${D_INITDIR}/boot.slx
+>>/mnt/etc/init.d/boot.slx
   # portmap is required for any NFS
   config_portmap
   rllinker "nfs-common" 10 8