* 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

13 files changed, 321 insertions, 1081 deletions

diff --git a/initramfs/distro-specs/suse/config-10.0 b/initramfs/distro-specs/suse/config-10.0
deleted file mode 100644
index 4cdba28e..00000000
--- a/initramfs/distro-specs/suse/config-10.0
+++ /dev/null
@@ -1,9 +0,0 @@
-# Description:  distro specific settings for SuSE 10.0. This file merily
-#               contains changes from the SuSE base configuration file
-#               (suse/config-default)
-#
-# Author(s):    Dirk von Suchodoletz <dirk@goe.net>, 26-01-2006
-#
-# Copyright:    (c) 2003, 2006 - RZ Universitaet Freiburg
-
-# nothing changed yet
diff --git a/initramfs/distro-specs/suse/config-10.1 b/initramfs/distro-specs/suse/config-10.1
deleted file mode 100644
index 82e25045..00000000
--- a/initramfs/distro-specs/suse/config-10.1
+++ /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 SuSE 10.1. This configuration might change
-# settings from SuSE default configuration file
-
-# D_SYSCONFDIR - system wide configuration settings - /etc/sysconfig in SuSE
-# 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_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_SPLASHY"
-D_RODIRSINRW="/etc/opt/gnome/gconf /etc/X11/xkb /var/adm /var/lib/texmf \
-/var/lib/rpm /var/cache/fontconfig"
diff --git a/initramfs/distro-specs/suse/config-10.2 b/initramfs/distro-specs/suse/config-10.2
deleted file mode 100644
index c3d44800..00000000
--- a/initramfs/distro-specs/suse/config-10.2
+++ /dev/null
@@ -1,39 +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 OpenSuSE 10.2. This configuration might change
-# settings from SuSE default configuration file
-
-# D_SYSCONFDIR - system wide configuration settings - /etc/sysconfig in SuSE
-# 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.
-# 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)
-# D_BOOTLOCAL - script for user specified stuff which should be started
-# during client bootup, path and file relative to /etc
-
-D_INITSCRIPTS="boot.udev boot.proc boot.klog boot.loadmodules boot.clock \
-boot.sysctl boot.ipconfig boot.swap $D_SPLASHY"
-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-10.3 b/initramfs/distro-specs/suse/config-10.3
deleted file mode 100644
index 97bb9b43..00000000
--- a/initramfs/distro-specs/suse/config-10.3
+++ /dev/null
@@ -1,40 +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 OpenSuSE 10.3. This configuration might change
-# settings from SuSE default configuration file
-
-# D_SYSCONFDIR - system wide configuration settings - /etc/sysconfig in SuSE
-# 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.
-# 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)
-# D_BOOTLOCAL - script for user specified stuff which should be started
-# during client bootup, path and file relative to /etc
-
-D_INITSCRIPTS="boot.udev boot.proc boot.klog boot.loadmodules boot.clock \
-boot.sysctl boot.ipconfig boot.swap $D_SPLASHY"
-D_RODIRSINRW="/etc/gconf /etc/opt/kde3/share/icons /var/adm /var/lib/texmf \
-/var/lib/rpm /var/cache/fontconfig"
-#D_HWMODTOIGNORE="i8xx-tco ichxrom snd-atiixp-modem intel-rng pata_atiixp"
-D_HWMODTOIGNORE="i8xx-tco ichxrom snd-atiixp-modem intel-rng"
-D_XORGBIN=/usr/bin/Xorg
diff --git a/initramfs/distro-specs/suse/config-9.3 b/initramfs/distro-specs/suse/config-9.3
deleted file mode 100644
index 5fb82825..00000000
--- a/initramfs/distro-specs/suse/config-9.3
+++ /dev/null
@@ -1,30 +0,0 @@
-# Description:  distro specific settings for SuSE 9.3. This configuration
-#		is the base for following SuSE versions until the changes
-#		within them require a major change
-#
-# Author(s):    Dirk von Suchodoletz <dirk@goe.net>, 23-06-2006
-#
-# Copyright:    (c) 2003, 2005 - RZ Universitaet Freiburg
-
-
-# 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_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_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
-
-# just the default
\ No newline at end of file
diff --git a/initramfs/distro-specs/suse/config-default b/initramfs/distro-specs/suse/config-default
deleted file mode 100644
index ccd45ac6..00000000
--- a/initramfs/distro-specs/suse/config-default
+++ /dev/null
@@ -1,63 +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 general SuSE. This configuration is the base
-# for following (Open)SuSE versions: 9.3 - 10.2
-
-# 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_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=/sysconfig
-D_ETCEXCL="*.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\nxorg.conf.*"
-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 \
-/var/lib/rpm"
-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="${D_INITDIR}/boot.d"
-D_INITDEFAULT="5"
-D_RCDIRS="/init.d/rc0.d /init.d/rc1.d /init.d/rc2.d /init.d/rc3.d \
-/init.d/rc4.d /init.d/rc5.d /init.d/rc6.d /init.d/rcS.d"
-D_INITSCRIPTS="boot.udev boot.proc boot.shm boot.klog boot.loadmodules \
-boot.clock boot.sysctl boot.ipconfig boot.swap $D_SPLASHY"
-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"
-D_BOOTLOCAL="init.d/boot.local"
diff --git a/initramfs/distro-specs/suse/files-default/etc/init.d/boot b/initramfs/distro-specs/suse/files-default/etc/init.d/boot
deleted file mode 100755
index ff0374dd..00000000
--- a/initramfs/distro-specs/suse/files-default/etc/init.d/boot
+++ /dev/null
@@ -1,285 +0,0 @@
-#!/bin/sh
-#
-# Description:	Modificated /etc/init.d/boot for use with Diskless 
-#		X Stations (v4.0) -> replaces /etc/init.d/boot
-#		simply copied over the original file in initrd
-#
-# Author(s):	Dirk von Suchodoletz <dirk@goe.net>, 08-04-2006
-# Copyright: 	(c) 2003, 2006 - RZ Universitaet Freiburg
-# 
-# Version:	0.0.2b
-# 
-# Some parts taken from /etc/init.d/boot by
-#
-# Copyright (c) 1996-2004 SuSE Linux AG, Nuernberg, Germany.
-# All rights reserved.
-#
-# Author: Ruediger Oertel <ro@suse.de>, 1996-2002
-#         Werner Fink <werner@suse.de>, 1996-2003
-#         Burchard Steinbild, 1996-2000
-#         Florian La Roche, 1996
-#
-# first script to be executed from init on system startup
-#
-# Most of preparation is done within the initial ramdisk
-#
-################################################################
-
-# Before we do anything else, try at first to activate SELinux support
-test -d /selinux && mount -n -t selinuxfs none /selinux &>/dev/null
-
-# Configuration and coloring of the boot messages
-. /etc/rc.status
-. /etc/sysconfig/boot
-. /etc/sysconfig/logfile
-
-# Avoid be interrupted by child or keyboard
-trap "echo" SIGINT SIGSEGV SIGQUIT
-set +e
-
-# reasonable start values for bootsplash progress
-export progress=0
-export sscripts=45
-export kscripts=45
-
-echo -n "System Boot Control: "
-echo "Running $0"
-
-################################################################
-#
-
-# some important (un)mounts
-rc_reset
-echo -n "Mounting /proc, /sys and /dev/pts filesystems"
-# file /etc/fstab in some scenarios not available
-mount -t proc proc /proc &>/dev/null
-rc_status -v -r
-
-echo -n "Mounting /dev/pts"
-mount -t devpts -o mode=0620,gid=5 devpts /dev/pts
-rc_status -v -r
-if [ -d /sys ] ; then
-    while read a b c  ; do
-        case "$b" in
-            sysfs)
-		echo -n "Mounting /sys filesystem"
-		echo -e "sysfs\t\t/sys\t\tsysfs\t\trw\t\t 0 0\n" \
-		  >>/etc/fstab
-		mount -t sysfs sysfs /sys
-		rc_status -v -r
-                break
-                ;;
-        esac
-    done < /proc/filesystems
-fi
-
-# Start blogd, requires /proc and /dev/pts.
-# Export the real device in variable REDIRECT.
-test -x /sbin/blogd -a -n "$REDIRECT" && /sbin/blogd $REDIRECT
-if test -z "$REDIRECT" ; then
-    if (echo -n > /dev/tty) 2>/dev/null ; then
-        REDIRECT=/dev/tty
-    else
-        REDIRECT=/dev/console
-    fi
-fi
-
-################################################################
-#
-# Save old terminal settings and set -nl to avoid staircase
-# effect, do not lock scrolling, and avoid break characters.
-otty=$(stty -g)
-if test "$FLOW_CONTROL" = "yes" ; then
-    stty -nl  ixon ignbrk -brkint
-else
-    stty -nl -ixon ignbrk -brkint
-fi
-
-################################################################
-#
-# Should we ask for interactive boot mode
-DO_CONFIRM=""
-read -t 2 check < /proc/cmdline 2> /dev/null
-case "$check" in
-    *confirm*) DO_CONFIRM=yes ;;
-esac
-test -z "$CONFIRM_PROMPT_TIMEOUT" && CONFIRM_PROMPT_TIMEOUT=5
-if test "$PROMPT_FOR_CONFIRM" = "yes" -a "$DO_CONFIRM" != "yes" ; then
-    echo -en "${extd}Enter Interactive startup mode?${norm}"
-    rc_timer_on "$CONFIRM_PROMPT_TIMEOUT" 37
-    read -t "$CONFIRM_PROMPT_TIMEOUT" -n 1 \
-        -p " ${extd}y${norm}/[${extd}n${norm}]\
-("${CONFIRM_PROMPT_TIMEOUT}s") " answer
-    rc_timer_off
-    case "$answer" in
-    [yYiI]) DO_CONFIRM=yes ;;
-    *)      DO_CONFIRM=    ;;
-    esac
-    unset answer
-    echo
-fi
-export DO_CONFIRM
-
-################################################################
-#
-# Common used variables
-bootrc=/etc/init.d/boot.d
-rex="[0-9][0-9]"
-failed=""
-skipped=""
-callord=""
-
-#
-# Initialize boosplash progressbar variables
-#
-. /etc/rc.splash B
-splashtrigger "rlchange B"
-
-################################################################
-#
-# Do we stop/start script in parallel?
-startpar=$(type -p startpar)
-test "$RUN_PARALLEL" = "yes" || startpar=""
-test "$DO_CONFIRM"   = "yes" && startpar=""
-
-# Start bootup client scripts.
-if test -d ${bootrc}/ ; then
-    for i in ${bootrc}/S*; do
-        test -f $i || continue
-
-        B=${i##*/}
-        script=${B#*S$rex}
-        B=${B%$script}
-
-        rc_splash "$script start"
-
-        if test "$DO_CONFIRM" = "yes" ; then
-            rc_confirm -t 5 "Start bootup script ${script}" \
-		< $REDIRECT > $REDIRECT 2>&1
-            case "$?" in
-            0) true     ;;
-            1) continue ;;
-            2) DO_CONFIRM=""
-            esac
-        fi
-
-        if test -z "$startpar" ; then
-            blogger "$script start"
-
-            if test -x "$i" ; then
-                $i start
-            else
-                echo Running $i
-                /bin/sh $i b
-                rc_status -v1 -r
-            fi
-            status=$?
-            echo -en "$rc_reset"
-
-            case $status in
-            [1-4])   failed="${failed:+$failed }$script"   ;;
-            [56])   skipped="${skipped:+$skipped }$script" ;;
-            [07]|*) ;;
-            esac
-
-            blogger "'$script start' exits with status $status"
-        else
-            # Parallel boot only for valid scripts
-            test -x $i || continue
-
-            # Current vector
-            eval cur=\${$B}
-            test -n "$cur" || callord="${callord:+$callord }$B"
-
-            # Remember scripts
-            eval $B="\${cur:+$i }\${cur:-$i}"
-        fi
-    done
-fi
-
-################################################################
-#
-# Call the scripts in correct order
-if test -n "$startpar" ; then
-    declare -i s
-    for p in $callord ; do
-        vect=$p
-        eval p=(\${$p})
-
-        blogger "run boot scripts (${p[@]##*S$rex})"
-        if test ${#p[@]} -eq 1 ; then
-            ${p} start
-            status=($?)
-        else
-            status=($($startpar -t 30 -T 3 -a start ${p[@]}))
-        fi
-        echo -en "$rc_reset"
-        blogger "exit status of (${p[@]##*S$rex}) is (${status[@]})"
-
-        s=0
-        for script in ${p[@]##*S$rex} ; do
-            case "${status[$s]}" in
-            [1-4])  failed="${failed:+$failed }$script"   ;;
-            [56])  skipped="${skipped:+$skipped }$script" ;;
-            0|*)   ;;
-            esac
-            : $((s++))
-        done
-    done
-fi
-
-################################################################
-#
-# Be verbose and print stats
-echo -n "System Boot Control: "
-echo -e "The system has been ${stat}${extd}set up${norm}"
-if test -n "$failed" ; then
-    n=$((${#failed} + 7))
-    echo -n  "Failed features: "
-    test $n -lt 47 && echo -en "\033[${COLUMNS}C\033[${n}D"
-    echo -e  "${warn}${failed}${norm}"
-fi
-if test -n "$skipped" ; then
-    n=$((${#skipped} + 7))
-    echo -n  "Skipped features: "
-    test $n -lt 47 && echo -en "\033[${COLUMNS}C\033[${n}D"
-    echo -e  "${attn}${skipped}${norm}"
-fi
-
-
-################################################################
-#
-# Check for boot cycle detection
-test -s /lib/bootcycle/stats && . /lib/bootcycle/stats
-
-
-# Remember for master resource script
-if test "$DO_CONFIRM" = "yes" ; then
-    touch /var/run/do_confirm
-fi
-
-# Restore old terminal settings
-stty $otty
-
-################################################################
-#
-# Let zic set timezone - if present (from boot.ldconfig).
-if test -n "$TIMEZONE" -a -x /usr/sbin/zic ; then
-	echo -n Setting up timezone data
-	/usr/sbin/zic -l $TIMEZONE
-	rc_status -v -r
-fi
-				 
-################################################################
-#
-# start user defined bootup script.
-if test -f /etc/init.d/boot.local ; then
-        ECHO_RETURN=$rc_done_up
-	echo "Running /etc/init.d/boot.local"
-        /bin/sh /etc/init.d/boot.local || rc_failed
-	rc_status -v1; rc_reset
-	rc_splash "boot.local start"
-fi
-
-rc_reset
-exit 0
diff --git a/initramfs/distro-specs/suse/functions-10.0 b/initramfs/distro-specs/suse/functions-10.0
deleted file mode 100644
index 5f7916d1..00000000
--- a/initramfs/distro-specs/suse/functions-10.0
+++ /dev/null
@@ -1,36 +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 functions for SuSE 10.0 which differ from functions defined
-# in general SuSE base definitions ...  General changes should be done there,
-# version specific changes for the version 10.0 go here.
-
-# secure shell service
-config_sshd () {
-if [ "x$start_sshd" = "xyes" ] ; then
-  if [ -f /mnt/etc/${D_INITDIR}/sshd ] ; then
-    testmkd /mnt/var/lib/sshd
-    testmkd /mnt/var/lib/empty
-    if ! strinfile "sshd:" /mnt/etc/passwd ; then
-      echo -e "sshd:x:71:65::/var/run/sshd:/bin/false" \
-        >>/mnt/etc/passwd
-      echo -e "sshd:!:13099:0:99999:7:::" >>/mnt/etc/shadow
-    fi
-    rllinker "sshd" 25 10
-  else
-    error "$df_errsshd" nonfatal
-  fi
-fi
-}
-# Xorg variable settings. Lots of stuff changes for newer Xorg servers
-displayvars () {
-synapticsdrv="/usr/X11R6/lib/modules/input/synaptics_drv.o"
-}
diff --git a/initramfs/distro-specs/suse/functions-10.1 b/initramfs/distro-specs/suse/functions-10.1
deleted file mode 100644
index 31ca9328..00000000
--- a/initramfs/distro-specs/suse/functions-10.1
+++ /dev/null
@@ -1,131 +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 functions for SuSE 10.1 which differ from functions defined
-# in general SuSE base definitions ...  General changes should be done there,
-# version specific changes for the 10.1 go here.
-
-# afs client
-# configure afs client
-config_afs () {
-if [ "x$start_afs" = "xyes" ] ; then
-  if [ -f /mnt/etc/init.d/openafs-client ] ; then
-    test -d /mnt/afs || error "${df_errafsd}"
-    testmkd /mnt/var/cache/openafs
-    rllinker "openafs-client" 15 6
-    #      echo -e "# /etc/sysconfig/afs-client - file generated by \
-    #$0:\n#\t$date\n" >/etc/sysconfig/afs-client.new;
-    #      sed -e "s,THIS_CELL_SERVER.*,THIS_CELL_SERVER=\"$cell_serv\"," \
-    #        -e "s,PREFERREDSERVERS.*,PREFERREDSERVERS=\"$cell_serv\"," \
-    #        -e "s,THIS_CELL.*,THIS_CELL=\"$this_cell\"," \
-    #        -e "s,MEMCACHE.*,MEMCACHE=\"yes\"," \
-    #        /etc/sysconfig/afs-client >> \
-    #            /etc/sysconfig/afs-client.new
-    #      mv /etc/sysconfig/afs-client.new /etc/sysconfig/afs-client
-  else
-    error "${df_errafsn}" nonfatal
-  fi
-fi
-}
-
-# set up keytable (function run in hwautocfg)
-# kbd runlevel link is in the list of initial runlevel scripts (see 
-# config-10.1 file)
-keytable () {
-# remove unneeded components from the startscript
-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
-}
-
-# 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
-}
-
-# check the glx and tvout stuff and configure it
-checkgraphix () {
-# test if unionfs
-case "${XMODULE}" in
-  radeon)
-    # IGP is not supported with fglrx driver (at least not in some versions)
-    # comment if it works properly ...
-    strinfile " IGP" /tmp/hwsetup.info && exit
-    # check ${XDESC}/ hwsetup.info device string in Cards file and then
-    # for needed components
-    # not all radeon cards are properly supported by fglrx, so the decision on
-    # module might be done via hwsetup!?
-    test -e /mnt/lib/modules/${KERNEL}/kernel/drivers/char/drm/fglrx.ko \
-      && test -e /mnt/usr/X11R6/lib/modules/drivers/fglrx_drv.* && { 
-        XMODULE=fglrx
-        # it only works for UnionFS enabled systems
-        ln -sf /usr/X11R6/lib/libGL.so.1.2 \
-          /mnt/usr/X11R6/lib/libGL.so.1 2>/dev/null
-        }
-    # check whether to enable tvout. option could be set in machine-setup
-    if [ -n "$tvout" ] && [ "$tvout" != "no" -a "$tvout" != "NO" ] ; then
-      [ "$tvout" = "yes" ] && tvout="PAL-B"
-      TVOUT='\tOption\t\t"TVFormat" "'$tvout
-      TVOUT=$TVOUT'"\n\tOption\t\t"DesktopSetup" "horizontal"'
-    fi
-  ;;
-  nv)
-    # check for needed components (kernel and libraries)
-    test -e /mnt/lib/modules/${KERNEL}/kernel/drivers/char/drm/nvidia.ko \
-      && test -e /mnt/usr/X11R6/lib/modules/drivers/nvidia_drv.* && {
-        gllib=$(ls /mnt/usr/X11R6/lib/libGL.so.1.0.* 2>/dev/null|sed -n "1p")
-        if [ -n "$gllib" ] ; then
-          ln -sf ${gllib#/mnt} /mnt/usr/X11R6/lib/libGL.so.1 2>/dev/null
-          # same for GLcore lib
-          gllib=$(ls /mnt/usr/X11R6/lib/libGLcore.so.1.0.* 2>/dev/null|\
-            sed -n "1p")
-          ln -sf ${gllib#/mnt} /mnt/usr/X11R6/lib/libGLcore.so.1 2>/dev/null \
-            || fail=1
-          # load server modules (trick put the path before the official one)
-          testmkd /mnt/etc/X11/modules
-          ln -sf /usr/X11R6/lib/modules/updates/extensions/libglx.so \
-            /mnt/etc/X11/modules/libglx.so || fail=1
-          ln -sf /usr/X11R6/lib/modules/updates/drivers/nvidia_drv.so \
-            /mnt/etc/X11/modules/nvidia_drv.so || fail=1
-          [ -z $fail ] && XMODULE=nvidia
-          # ensure proper permissions for nvidia devices - does not work for some reason
-          #echo -e "# nvidia stuff added by $0 in InitRamFS\nKERNEL==\"nvidia*|nvidiactl*\",\
-#GROUP=\"video\",MODE=\"0666\"" > /mnt/etc/udev/rules.d/10-nvidia-devperms.rules
-       fi
-       }
-  ;;
-esac
-}
-
-# secure shell service
-config_sshd () {
-if [ "x$start_sshd" = "xyes" ] ; then
-  if [ -f /mnt/etc/${D_INITDIR}/sshd ] ; then
-    testmkd /mnt/var/lib/sshd
-    testmkd /mnt/var/lib/empty
-    if ! strinfile "sshd:" /mnt/etc/passwd ; then
-      echo -e "sshd:x:71:65::/var/run/sshd:/bin/false" \
-        >>/mnt/etc/passwd
-      echo -e "sshd:!:13099:0:99999:7:::" >>/mnt/etc/shadow
-    fi
-    rllinker "sshd" 25 10
-  else
-    error "$df_errsshd" nonfatal
-  fi
-fi
-}
-
-# Xorg variable settings. Lots of stuff changes for newer Xorg servers
-displayvars () {
-synapticsdrv="/usr/X11R6/lib/modules/input/synaptics_drv.o"
-}
diff --git a/initramfs/distro-specs/suse/functions-10.2 b/initramfs/distro-specs/suse/functions-10.2
deleted file mode 100644
index 983e7ad8..00000000
--- a/initramfs/distro-specs/suse/functions-10.2
+++ /dev/null
@@ -1,170 +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 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.
-
-# configure dbus (inter application communication for kde and gnome), hal
-# (hardware abstraction layer - used e.g. by powersaved), resmgr and 
-# policykitd (resource manager/policykitd - the user gets permissions to 
-# devices when loggin on)
-config_dreshal () {
-if [ "x$start_dreshal" = "xyes" ]; then
-  local start=5
-  local stop=18
-  if [ -f /mnt/etc/${D_INITDIR}/dbus ] ; then
-    strinfile "messagebus:" /mnt/etc/passwd || \
-      echo "messagebus:x:100:101:User for D-BUS:/var/run/dbus:/bin/false" \
-        >> /mnt/etc/passwd
-    strinfile "messagebus:" /mnt/etc/group || \
-      echo "messagebus:!:101:" >> /mnt/etc/group
-    testmkd /mnt/var/run/dbus
-    # set permissions with userid
-    echo -e "\tchown messagebus:messagebus /var/run/dbus 2>/dev/null" \
-      >>/mnt/etc/${D_INITDIR}/boot.slx
-    rllinker "dbus" $start $stop
-  fi
-  if [ -f /mnt/etc/${D_INITDIR}/resmgr ] ; then
-    testmkd /mnt/var/run/resmgr/classes
-    start=$(($start + 1))
-    stop=$(($stop - 1))
-    rllinker "resmgr" $start $stop
-  fi
-  if [ -f /mnt/etc/${D_INITDIR}/policykitd ] ; then
-    testmkd /mnt/var/run/polkit
-    start=$(($start + 1))
-    stop=$(($stop - 1))
-    rllinker "policykitd" $start $stop
-  fi
-  if [ -f /mnt/etc/${D_INITDIR}/haldaemon ] ; then
-    strinfile "haldaemon:" /mnt/etc/passwd || \
-      echo "haldaemon:x:105:103:User for haldaemon:/var/run/hal:/bin/false" \
-        >> /mnt/etc/passwd
-    strinfile "haldaemon:" /mnt/etc/group || \
-      echo "haldaemon:!:103:" >> /mnt/etc/group
-    testmkd /mnt/var/run/hal
-    # set permissions with userid
-    echo -e "\tchown haldaemon:haldaemon /var/run/hal 2>/dev/null" \
-      >>/mnt/etc/${D_INITDIR}/boot.slx
-    start=$(($start + 1))
-    stop=$(($stop - 1))
-    rllinker "haldaemon" $start $stop
-  fi
-fi
-}
-# config nfsv4
-config_nfsv4 () {
-if [ "x$start_nfsv4" = "xyes" ]; then
-  testmkd /mnt/var/lib/nfs/rpc_pipefs
-  sed -e "s,NFS_SECURITY_GSS=.*,NFS_SECURITY_GSS=\"yes\"," \
-      -e "s,NFS4_SUPPORT=.*,NFS4_SUPPORT=\"yes\"," \
-      -i /mnt/etc/sysconfig/nfs
-  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
-  # portmap is required for any NFS
-  config_portmap
-  rllinker "idmapd" 14 8
-  rllinker "gssd" 15 7
-fi
-}
-
-# set up keytable (function run in hwautocfg)
-keytable () {
-if [ -f /mnt/etc/${D_INITDIR}/kbd ] ; then
-  # remove unneeded components from the startscript
-  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
-  ln -sf /etc/${D_INITDIR}/kbd /mnt/etc/${D_INITBOOTD}/S01boot.kbd
-else
-  error "$df_errkbd" nonfatal
-fi
-}
-
-# 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.slx
-}
-
-# check the glx and tvout stuff and configure it
-checkgraphix () {
-# test if unionfs
-case "${XMODULE}" in
-  radeon)
-    # IGP is not supported with fglrx driver (at least not in some versions)
-    # comment if it works properly ...
-    if ! strinfile " IGP" /tmp/hwsetup.info ; then
-      # check ${XDESC}/ hwsetup.info device string in Cards file and then
-      # for needed components
-      test -e /mnt/lib/modules/${KERNEL}/kernel/drivers/char/drm/fglrx.ko \
-        && test -e /mnt/usr/lib/xorg/modules/drivers/fglrx_drv.* && { 
-          XMODULE=fglrx
-          # it only works for UnionFS enabled systems or put it in preload
-          # but that might be not to clever :-)
-          ln -sf /usr/lib/xorg/libGL.so.1.2 \
-            /mnt/usr/lib/libGL.so.1.2 2>/dev/null || \
-          echo -e "/usr/lib/xorg/libGL.so.1.2\n/usr/lib/xorg/libGL.so.1\n\
-/usr/lib/xorg/libGL.so" >/mnt/etc/ld.so.preload
-          }
-      # check whether to enable tvout
-      if [ -n "$tvout" ] && [ "$tvout" != "no" -a "$tvout" != "NO" ] ; then
-        [ "$tvout" = "yes" ] && tvout="PAL-B"
-        TVOUT='\tOption\t\t"TVFormat" "'$tvout
-        TVOUT=$TVOUT'"\n\tOption\t\t"DesktopSetup" "horizontal"'
-      fi
-    fi
-  ;;
-  nv)
-    # check for needed components
-    test -e /mnt/lib/modules/${KERNEL}/kernel/drivers/char/drm/nvidia.ko \
-      && test -e /mnt/usr/X11R6/lib/modules/drivers/nvidia_drv.* && {
-        gllib=$(ls /mnt/usr/X11R6/lib/libGL.so.1.0.* 2>/dev/null|sed -n "1p")
-        if [ -n "$gllib" ] ; then
-          ln -sf ${gllib#/mnt} /mnt/usr/lib/libGL.so.1 2>/dev/null
-          # same for GLcore lib
-          gllib=$(ls /mnt/usr/X11R6/lib/libGLcore.so.1.0.* 2>/dev/null|\
-            sed -n "1p")
-          ln -sf ${gllib#/mnt} /mnt/usr/lib/libGLcore.so.1.0 2>/dev/null \
-            || fail=1
-          # load server modules (trick put the path before the official one)
-          testmkd /mnt/etc/X11/modules
-          ln -sf /usr/lib/xorg/modules/updates/extensions/libglx.so \
-            /mnt/etc/X11/modules/libglx.so || fail=1
-          ln -sf /usr/lib/xorg/modules/updates/drivers/nvidia_drv.so \
-            /mnt/etc/X11/modules/nvidia_drv.so || fail=1
-          [ -z $fail ] && XMODULE=nvidia
-          # ensure proper permissions for nvidia devices
-          echo -e "# nvidia stuff added by $0 in InitRamFS\nKERNEL==\"nvidia*|nvidiactl*\",\
-GROUP=\"video\",MODE=\"0666\"" > /mnt/etc/udev/rules.d/10-nvidia-devperms.rules
-       fi
-       }
-  ;;
-esac
-}
-
-# deprecated this way ...
-# Xorg variable settings. Lots of stuff changed from 10.1 to 10.2
-displayvars () {
-Files='\tModulePath\t"/etc/X11/modules"\n
-\tModulePath\t"/usr/lib/xorg/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"'
-synapticsdrv="/usr/lib/xorg/modules/input/synaptics_drv.so"
-}
diff --git a/initramfs/distro-specs/suse/functions-10.3 b/initramfs/distro-specs/suse/functions-10.3
deleted file mode 100644
index f18f7845..00000000
--- a/initramfs/distro-specs/suse/functions-10.3
+++ /dev/null
@@ -1,61 +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 functions for (Open)SuSE 10.3 which differ from functions
-# defined in general SuSE base definitions ...  General changes should be done
-# there, version specific changes for the 10.3 go here.
-
-# config nfsv4
-config_nfsv4 () {
-if [ "x$start_nfsv4" = "xyes" ]; then
-  testmkd /mnt/var/lib/nfs/rpc_pipefs
-  testmkd /mnt/var/lib/nfs/sm
-  sed -e "s,NFS_SECURITY_GSS=.*,NFS_SECURITY_GSS=\"yes\"," \
-      -e "s,NFS4_SUPPORT=.*,NFS4_SUPPORT=\"yes\"," \
-      -i /mnt/etc/sysconfig/nfs
-  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
-  # portmap is required for any NFS
-  config_portmap
-  rllinker "nfs" 14 8
-fi
-}
-
-# set up keytable (function run in hwautocfg)
-# kbd runlevel link is in the list of initial runlevel scripts (see 
-# suse/config-10.2 file)
-keytable () {
-# remove unneeded components from the startscript
-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
-rllinker kbd 1 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
-}
-
-# Xorg variable settings. Lots of stuff changed since 10.2
-displayvars () {
-Files='\tModulePath\t"/etc/X11/modules"\n
-\tModulePath\t"/usr/lib/xorg/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"'
-synapticsdrv="/usr/lib/xorg/modules/input/synaptics_drv.so"
-}
diff --git a/initramfs/distro-specs/suse/functions-9.3 b/initramfs/distro-specs/suse/functions-9.3
deleted file mode 100644
index d4c40422..00000000
--- a/initramfs/distro-specs/suse/functions-9.3
+++ /dev/null
@@ -1,82 +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 functions for SuSE 9.3 which differ from functions defined
-# in general SuSE base definitions ...  General changes should be done there,
-# version specific changes for the 9.3 go here.
-
-# acpi and powersave
-config_acpi () {
-rllinker powersaved 10 12
-}
-
-# configure dbus (inter application communication for kde and gnome), hal
-# (hardware abstraction layer - used e.g. by powersaved) and resmgr
-# (resource manager - the user gets permissions to devices when loggin on)
-config_dreshal () {
-local start=5
-local stop=18
-if [ "x$start_dreshal" = "xyes" ]; then
-  if [ -e /mnt/etc/${D_INITDIR}/dbus ] ; then
-    strinfile "messagebus:" /mnt/etc/passwd || \
-      echo "messagebus:x:100:101:User for D-BUS:/var/run/dbus:/bin/false" \
-        >> /mnt/etc/passwd
-    strinfile "messagebus:" /mnt/etc/group || \
-      echo "messagebus:!:101:" >> /mnt/etc/group
-    testmkd /mnt/var/run/dbus
-    # set permissions with userid
-    echo -e "\tchown messagebus:messagebus /var/run/dbus 2>/dev/null" \
-      >>/mnt/etc/${D_INITDIR}/boot.slx
-    rllinker "dbus" $start $stop
-  fi
-  if [ -e /mnt/etc/${D_INITDIR}/resmgr ] ; then
-    testmkd /mnt/var/run/resmgr/classes
-    start=$(($start + 1))
-    stop=$(($start - 1))
-    rllinker "resmgr" $start $stop
-  fi
-  if [ -e /mnt/etc/${D_INITDIR}/hal ] ; then
-    strinfile "haldaemon:" /mnt/etc/passwd || \
-      echo "haldaemon:x:105:103:User for haldaemon:/var/run/hal:/bin/false" \
-        >> /mnt/etc/passwd
-    strinfile "haldaemon:" /mnt/etc/group || \
-      echo "haldaemon:!:103:" >> /mnt/etc/group
-    testmkd /mnt/var/run/hal
-    # set permissions with userid
-    echo -e "\tchown haldaemon:haldaemon /var/run/hal 2>/dev/null" \
-      >>/mnt/etc/${D_INITDIR}/boot.slx
-    start=$(($start + 1))
-    stop=$(($start - 1))
-    rllinker "hal" $start $stop
-  fi
-fi
-}
-# secure shell service
-config_sshd () {
-if [ "x$start_sshd" = "xyes" ] ; then
-  if [ -f /mnt/etc/${D_INITDIR}/sshd ] ; then
-    testmkd /mnt/var/lib/sshd
-    testmkd /mnt/var/lib/empty
-    if ! strinfile "sshd:" /mnt/etc/passwd ; then
-      echo -e "sshd:x:71:65::/var/run/sshd:/bin/false" \
-        >>/mnt/etc/passwd
-      echo -e "sshd:!:13099:0:99999:7:::" >>/mnt/etc/shadow
-    fi
-    rllinker "sshd" 20 10
-  else
-    error "$df_errsshd" nonfatal
-  fi
-fi
-}
-# Xorg variable settings. Lots of stuff has changed for newer Xorg servers
-displayvars () {
-synapticsdrv="/usr/X11R6/lib/modules/input/synaptics_drv.o"
-}
diff --git a/initramfs/distro-specs/suse/functions-default b/initramfs/distro-specs/suse/functions-default
index c34c4003..71b0495c 100644
--- a/initramfs/distro-specs/suse/functions-default
+++ b/initramfs/distro-specs/suse/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
@@ -14,23 +14,54 @@
 # inclusion of the main functions file). This file is the main base for the
 # several SuSE distro versions
 
+# settings of central variables (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="*.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"
+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 \
+/var/lib/rpm"
+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 function called from servconfig script
 config_distro () {
-# no need to run start scripts in parallel
-# enable magic sysrequest for the clients
-  sed -e "1i# /etc/${D_SYSCONFDIR}/sysctl - modified by $0 version $version" \
+  # 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 boot.d ; do
+    rm -rf /mnt/etc/init.d/${dir}/*
+  done
+  # link the additional key setup (notbook special keys)
+  [ grep -q -E "otebook" /etc/hwinfo.bios -a \
+    -e /mnt/etc/init.d/hotkey-setup ] && rllinker "hotkey-setup" 25 25
+
+  # no need to run start scripts in parallel
+  # enable magic sysrequest for the clients
+  sed -e "1i# /etc/sysconfig/sysctl - modified by $0 version $version" \
       -e "s,ENABLE_SYSRQ=.*,ENABLE_SYSRQ=\"yes\"," \
-      -i /mnt/etc/${D_SYSCONFDIR}/sysctl
+      -i /mnt/etc/sysconfig/sysctl
   # add specific path /var/X11R6/bin ...
   echo -e "# stuff generated by $0 (out of InitRamFS written $date)\n\
 PATH=\"\$PATH:/var/X11R6/bin\"\n\
 test \"\$UID\" -ge 100 && PATH=\"\$PATH:.\"\n\
 QTDIR=/usr/lib/qt3\nexport QTDIR\nno_proxy='localhost'\n\
-export no_proxy" > /mnt/etc/SuSEconfig/profile
+export no_proxy" >/mnt/etc/SuSEconfig/profile
   echo -e "SLX VERSION = $SLXVERSION\nINITRAMFS GENERATION DATE = $date" \
-    >> /mnt/etc/SuSE-release
+    >>/mnt/etc/SuSE-release
 
   # remove annoying udev rule set for changing eth interface and rtc symlink
   rm /mnt/etc/udev/rules.d/*persistent-net.rules \
@@ -50,21 +81,261 @@ export no_proxy" > /mnt/etc/SuSEconfig/profile
 rc_reset\ntest -e /etc/init.d/halt.local && {
 \techo Running /etc/init.d/halt.local\n\t/bin/sh /etc/init.d/halt.local
 \trc_status -v1 -r\n}
-echo $message\nexec $command -d -f' > /mnt/etc/${D_INITDIR}/halt
+echo $message\nexec $command -d -f' >/mnt/etc/init.d/halt
   # add the halt link to the 0 and 6 runlevel directories
-  ln -sf ../halt /mnt/etc/${D_INITDIR}/rc0.d/S20halt
-  ln -sf ../halt /mnt/etc/${D_INITDIR}/rc6.d/S20reboot
+  ln -sf ../halt /mnt/etc/init.d/rc0.d/S20halt
+  ln -sf ../halt /mnt/etc/init.d/rc6.d/S20reboot
+  
+  echo "LOGFILE=${LOGFILE}" >/mnt/etc/sysconfig/logfile
+  # fixme: rather ugly to write that boot script this way
+  echo '
+#!/bin/sh
+# SuSE specific initial boot file modified for the use with OpenSLX clients
+#
+###########################################################################
+
+# Before we do anything else, try at first to activate SELinux support
+test -d /selinux && mount -n -t selinuxfs none /selinux &>/dev/null
+
+# Configuration and coloring of the boot messages
+. /etc/rc.status
+. /etc/sysconfig/boot
+. /etc/sysconfig/logfile
+
+# Avoid be interrupted by child or keyboard
+trap "echo" SIGINT SIGSEGV SIGQUIT
+set +e
+
+# reasonable start values for bootsplash progress
+export progress=0
+export sscripts=45
+export kscripts=45
+
+echo -n "System Boot Control: "
+echo "Running $0"
+
+###########################################################################
+#
+
+# some important (un)mounts
+rc_reset
+echo -n "Mounting /proc, /sys and /dev/pts filesystems"
+# file /etc/fstab in some scenarios not available
+mount -t proc proc /proc &>/dev/null
+rc_status -v -r
+
+echo -n "Mounting /dev/pts"
+mount -t devpts -o mode=0620,gid=5 devpts /dev/pts
+rc_status -v -r
+if [ -d /sys ] ; then
+    while read a b c  ; do
+        case "$b" in
+            sysfs)
+                echo -n "Mounting /sys filesystem"
+                echo -e "sysfs\t\t/sys\t\tsysfs\t\trw\t\t 0 0\n" \
+                  >>/etc/fstab
+                mount -t sysfs sysfs /sys
+                rc_status -v -r
+                break
+                ;;
+        esac
+    done < /proc/filesystems
+fi
+
+# Start blogd, requires /proc and /dev/pts.
+# Export the real device in variable REDIRECT.
+test -x /sbin/blogd -a -n "$REDIRECT" && /sbin/blogd $REDIRECT
+if test -z "$REDIRECT" ; then
+    if (echo -n > /dev/tty) 2>/dev/null ; then
+        REDIRECT=/dev/tty
+    else
+        REDIRECT=/dev/console
+    fi
+fi
+
+###########################################################################
+#
+# Save old terminal settings and set -nl to avoid staircase
+# effect, do not lock scrolling, and avoid break characters.
+otty=$(stty -g)
+if test "$FLOW_CONTROL" = "yes" ; then
+    stty -nl  ixon ignbrk -brkint
+else
+    stty -nl -ixon ignbrk -brkint
+fi
+
+###########################################################################
+#
+# Common used variables
+bootrc=/etc/init.d/boot.d
+rex="[0-9][0-9]"
+failed=""
+skipped=""
+callord=""
+
+#
+# Initialize boosplash progressbar variables
+#
+. /etc/rc.splash B
+splashtrigger "rlchange B"
+
+###########################################################################
+#
+# Do we stop/start script in parallel?
+startpar=$(type -p startpar)
+test "$RUN_PARALLEL" = "yes" || startpar=""
+
+# Start bootup client scripts.
+if test -d ${bootrc}/ ; then
+    for i in ${bootrc}/S*; do
+        test -f $i || continue
+
+        B=${i##*/}
+        script=${B#*S$rex}
+        B=${B%$script}
+
+        rc_splash "$script start"
+
+        if test -z "$startpar" ; then
+            blogger "$script start"
+
+            if test -x "$i" ; then
+                $i start
+            else
+                echo Running $i
+                /bin/sh $i b
+                rc_status -v1 -r
+            fi
+            status=$?
+            echo -en "$rc_reset"
+
+            case $status in
+            [1-4])   failed="${failed:+$failed }$script"   ;;
+            [56])   skipped="${skipped:+$skipped }$script" ;;
+            [07]|*) ;;
+            esac
+
+            blogger "$script start exits with status $status"
+        else
+            # Parallel boot only for valid scripts
+            test -x $i || continue
+
+            # Current vector
+            eval cur=\${$B}
+            test -n "$cur" || callord="${callord:+$callord }$B"
+
+            # Remember scripts
+            eval $B="\${cur:+$i }\${cur:-$i}"
+        fi
+    done
+fi
+
+###########################################################################
+#
+# Call the scripts in correct order
+if test -n "$startpar" ; then
+    declare -i s
+    for p in $callord ; do
+        vect=$p
+        eval p=(\${$p})
+
+        blogger "run boot scripts (${p[@]##*S$rex})"
+        if test ${#p[@]} -eq 1 ; then
+            ${p} start
+            status=($?)
+        else
+            status=($($startpar -t 30 -T 3 -a start ${p[@]}))
+        fi
+        echo -en "$rc_reset"
+        blogger "exit status of (${p[@]##*S$rex}) is (${status[@]})"
+
+        s=0
+        for script in ${p[@]##*S$rex} ; do
+            case "${status[$s]}" in
+            [1-4])  failed="${failed:+$failed }$script"   ;;
+            [56])  skipped="${skipped:+$skipped }$script" ;;
+            0|*)   ;;
+            esac
+            : $((s++))
+        done
+    done
+fi
+
+###########################################################################
+#
+# Be verbose and print stats
+echo -n "System Boot Control: "
+echo -e "The system has been ${stat}${extd}set up${norm}"
+if test -n "$failed" ; then
+    n=$((${#failed} + 7))
+    echo -n  "Failed features: "
+    test $n -lt 47 && echo -en "\033[${COLUMNS}C\033[${n}D"
+    echo -e  "${warn}${failed}${norm}"
+fi
+if test -n "$skipped" ; then
+    n=$((${#skipped} + 7))
+    echo -n  "Skipped features: "
+    test $n -lt 47 && echo -en "\033[${COLUMNS}C\033[${n}D"
+    echo -e  "${attn}${skipped}${norm}"
+fi
+
+###########################################################################
+#
+# Check for boot cycle detection
+test -s /lib/bootcycle/stats && . /lib/bootcycle/stats
+
+# Restore old terminal settings
+stty $otty
+
+###########################################################################
+#
+# Let zic set timezone - if present (from boot.ldconfig).
+if test -n "$TIMEZONE" -a -x /usr/sbin/zic ; then
+        echo -n Setting up timezone data
+        /usr/sbin/zic -l $TIMEZONE
+        rc_status -v -r
+fi
+
+###########################################################################
+#
+# start user defined bootup script.
+if test -f /etc/init.d/boot.local ; then
+        ECHO_RETURN=$rc_done_up
+        echo "Running /etc/init.d/boot.local"
+        /bin/sh /etc/init.d/boot.local || rc_failed
+        rc_status -v1; rc_reset
+        rc_splash "boot.local start"
+fi
+
+rc_reset
+exit 0' >/mnt/etc/init.d/boot
+
   # enable execution of all important start scripts
   # running stuff in parallel seems to be rather useless and generates some
   # difficult to solve problems. If you want to try nevertheless enable the
   # following line and disable the latter one (switching off that feature)
   sed -e "s,RUN_PARALLEL=.*,RUN_PARALLEL=\"no\"," \
-      -i /mnt/etc/${D_SYSCONFDIR}/boot
+      -i /mnt/etc/sysconfig/boot
   # if YaST2 should be runnable (without much effect anyway) on the client
   testmkd /mnt/var/log/YaST2
   echo "$host_name" > /mnt/etc/HOSTNAME
 }
 
+# initial (boot time) runlevel scripts
+initial_boot () {
+local scripts=$*
+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 boot.udev boot.proc boot.klog boot.loadmodules boot.clock \
+boot.sysctl boot.ipconfig boot.swap $D_SPLASHY; do
+  count=$(($count + 1))
+  [ $DEBUGLEVEL -ge 2 ] && echo "boot-runlevelscript $i"
+  ln -sf /etc/init.d/$i /mnt/etc/init.d/boot.d/S${count}$i
+done
+}
+
 # linking runlevel scripts
 rllinker () {
 local script="$1"
@@ -78,7 +349,7 @@ fi
 # passed via configuration
 for i in rc3.d/K$stop$script rc5.d/K$stop$script \
          rc3.d/S$start$script rc5.d/S$start$script ; do
-  ln -sf ../$script /mnt/etc/${D_INITDIR}/$i
+  ln -sf ../$script /mnt/etc/init.d/$i
 done
 }
 
@@ -86,7 +357,7 @@ done
 # second stop
 # function for ntp configuration
 config_ntp () {
-if [ -e /mnt/etc/${D_INITDIR}/ntp ] ; then
+if [ -e /mnt/etc/init.d/ntp ] ; then
   if ! strinfile "ntp:" /mnt/etc/passwd ; then
     echo -e "ntp:x:74:65534:NTP daemon:/var/lib/ntp:/bin/false" \
       >>/mnt/etc/passwd
@@ -107,7 +378,7 @@ fi
 # function for configuration of cron services
 config_cron () {
 if [ "x$start_cron" = "xyes" ] ; then
-  if [ -f /mnt/etc/${D_INITDIR}/cron ] ; then
+  if [ -f /mnt/etc/init.d/cron ] ; then
     rllinker "cron" 18 2
     testmkd /mnt/var/spool/cron/lastrun
     testmkd /mnt/var/spool/cron/tabs
@@ -126,7 +397,7 @@ if [ "x$start_syslog" != "xno" ] ; then
   # enable basic logging to console tty10; file logging could be enabled via
   # setting of config_syslog="file"
   start_syslog="yes"
-  if [ -f /mnt/etc/${D_INITDIR}/syslog ] ; then
+  if [ -f /mnt/etc/init.d/syslog ] ; then
     sed -e "1i# modified in InitRamFS by $0" \
         -e "s,SYSLOG_DAEMON=.*,SYSLOG_DAEMON=\"syslog-ng\"," \
         -i /mnt/etc/sysconfig/syslog
@@ -141,7 +412,7 @@ fi
 # secure shell service
 config_sshd () {
 if [ "x$start_sshd" = "xyes" ] ; then
-  if [ -f /mnt/etc/${D_INITDIR}/sshd ] ; then
+  if [ -f /mnt/etc/init.d/sshd ] ; then
     testmkd /mnt/var/run/sshd
     testmkd /mnt/var/lib/empty
     if ! strinfile "sshd:" /mnt/etc/passwd ; then
@@ -151,7 +422,7 @@ if [ "x$start_sshd" = "xyes" ] ; then
     fi
     # set permissions with userid
     #echo -e "\tchown sshd:nogroup /var/run/sshd /var/lib/empty 2>/dev/null" \
-    #  >>/mnt/etc/${D_INITDIR}/boot.slx 
+    #  >>/mnt/etc/init.d/boot.slx 
     rllinker "sshd" 25 10
   else
     error "$df_errsshd" nonfatal
@@ -161,7 +432,7 @@ fi
 # snmp agent for remote monitoring
 config_snmp () {
 if [ "x$start_snmp" = "xyes" ] ; then
-  if [ -f /mnt/etc/${D_INITDIR}/snmpd ] ; then
+  if [ -f /mnt/etc/init.d/snmpd ] ; then
     rllinker "snmpd" 24 2
     testmkd /mnt/var/lib/net-snmp >/dev/null 2>&1
   fi
@@ -194,70 +465,30 @@ fi
 # configuration file
 if [ "x$lpr_servers" != "x" ] && [ ! -e /rootfs/etc/cups/client.conf ] ; then
   echo -e "# /etc/cups/client.conf - file generated by\n#\t$0:\n\
-#\t$date\n#\nServerName\t$lpr_servers" > /mnt/etc/cups/client.conf
-fi
-}
-# configure samba service
-config_samba () {
-if [ "$start_samba" != "no" ]; then
-  testmkd /mnt/var/run/samba
-  if [ "$start_samba" = "yes" ] && [ -f /mnt/etc/init.d/smb ] ; then
-    rllinker "smb" 27 2
-    rllinker "nmb" 28 2
-  fi
-  # set up samba configuration with NetBIOS name servers etc.
-  if [ "x$netbios_name_servers" != "x" ]; then
-    wins_server="\\twins server = $netbios_name_servers"
-  else
-    wins_server=";\\twins server = 127.0.0.1"
-  fi
-  if [ "x$netbios_workgroup" != "x" ]; then
-    workgroup="workgroup = $new_netbios_workgroup"
-  else
-    workgroup="workgroup = openslx"
-  fi
-  # avoid to overwrite admin provided samba configuration file
-  [ ! -f /rootfs/etc/samba/smb.conf ] && [ -f /mnt/etc/samba/smb.conf ] && \
-    sed -e "1i# modified in InitRamFS by $0" \
-        -e "s,\s*netbios name.*,netbios name = ${host_name},g" \
-        -e "s,\s*interfaces.*,interfaces = ${clientip}/${subnet_mask},g" \
-        -e "s,;.*wins server.*,$wins_server,g"   \
-        -e "s,\s*workgroup =.*,$workgroup,g" \
-        -i  /mnt/etc/samba/smb.conf;
-  # special kde network discovery service
-  [ -f /mnt/etc/lisarc ] && [ ! -f /rootfs/etc/lisarc ] &&
-    sed -e "1i# modified in InitRamFS by $0" \
-        -e "s,AllowedA.*,AllowedAddresses=${clientip}/${subnet_mask};,g" \
-        -e "s,BroadcastN.*,BroadcastNetwork=${clientip}/${subnet_mask};,g" \
-        -e "s,PingAdd.*,PingAddresses=${clientip}/${subnet_mask};,g" \
-        -i /mnt/etc/lisarc
+#\t$date\n#\nServerName\t$lpr_servers" >/mnt/etc/cups/client.conf
 fi
 }
 # configure bluetooth services
 config_bt () {
-if [ -e /mnt/etc/${D_SYSCONFDIR}/bluetooth ] ; then
-  sed -e "1i# /etc/${D_SYSCONFDIR}/bluetooth - file modified by $0" \
+if [ -e /mnt/etc/sysconfig/bluetooth ] ; then
+  sed -e "1i# /etc/sysconfig/bluetooth - file modified by $0" \
       -e "s,START_SERVICES.*,START_SERVICES=\"yes\"," \
-      -i /mnt/etc/${D_SYSCONFDIR}/bluetooth
+      -i /mnt/etc/sysconfig/bluetooth
 else
   : # no bluetooth components installed
 fi
 }
-# set up keytable (function run in hwautocfg)
-# kbd runlevel link is set via config_distro to avoid clashes between
-# servconfig and hwautocfg settings
-keytable () {
+# set up localization like keytable and consolefont
+dlocale () {
+echo -e "\t# entries added by $0: $date" >> /mnt/etc/init.d/boot.slx
 sed -e "s,KEYTABLE=.*,KEYTABLE=\"${KEYTABLE}\"," \
-  -i /mnt/etc/${D_SYSCONFDIR}/keyboard
+  -i /mnt/etc/sysconfig/keyboard
 echo -e "\tloadkeys ${KEYTABLE} >${LOGFILE} 2>&1\n" \
-  >>/mnt/etc/${D_INITDIR}/boot.slx
-}
-# consolefont and language (function run in hwautocfg)
-consolefont () {
+  >>/mnt/etc/init.d/boot.slx
 echo -e "\tsetfont ${CONSOLE_FONT} >${LOGFILE} 2>&1\n" \
-  >>/mnt/etc/${D_INITDIR}/boot.slx
+  >>/mnt/etc/init.d/boot.slx
 sed -e "s,RC_LANG=.*,RC_LANG=\"${LANG}\" # added in initrd," \
-    -i /mnt/etc/${D_SYSCONFDIR}/language
+    -i /mnt/etc/sysconfig/language
 }
 # acpi and powersave daemons, required e.g. to shutdown the machine via
 # power button, no need for early start
@@ -279,7 +510,7 @@ if [ "x$start_dreshal" = "xyes" ]; then
              /var/cache/hald /var/lib/PolicyKit; do
     testmkd /mnt/$dir
   done
-  if [ -f /mnt/etc/${D_INITDIR}/dbus ] ; then
+  if [ -f /mnt/etc/init.d/dbus ] ; then
     strinfile "messagebus:" /mnt/etc/passwd || \
       echo "messagebus:x:100:101:User for D-BUS:/var/run/dbus:/bin/false" \
         >> /mnt/etc/passwd
@@ -287,10 +518,10 @@ if [ "x$start_dreshal" = "xyes" ]; then
       echo "messagebus:!:101:" >> /mnt/etc/group
     # set permissions with userid
     echo -e "\tchown messagebus:messagebus /var/run/dbus 2>/dev/null" \
-      >>/mnt/etc/${D_INITDIR}/boot.slx
+      >>/mnt/etc/init.d/boot.slx
     rllinker "dbus" $start $stop
   fi
-  if [ -f /mnt/etc/${D_INITDIR}/consolekit ] ; then
+  if [ -f /mnt/etc/init.d/consolekit ] ; then
     strinfile "polkituser:" /mnt/etc/passwd || \
       echo "polkituser:x:104:106:PolicyKit:/var/run/PolicyKit:/bin/false" \
         >> /mnt/etc/passwd
@@ -300,12 +531,12 @@ if [ "x$start_dreshal" = "xyes" ]; then
     echo -n > /mnt/var/lib/misc/PolicyKit.reload
     chmod a+x /mnt/var/lib/misc/PolicyKit.reload
   fi
-  if [ -f /mnt/etc/${D_INITDIR}/resmgr ] ; then
+  if [ -f /mnt/etc/init.d/resmgr ] ; then
     start=$(($start + 1))
     stop=$(($stop - 1))
     rllinker "resmgr" $start $stop
   fi
-  if [ -f /mnt/etc/${D_INITDIR}/haldaemon ] ; then
+  if [ -f /mnt/etc/init.d/haldaemon ] ; then
     strinfile "haldaemon:" /mnt/etc/passwd || \
       echo "haldaemon:x:105:103:User for haldaemon:/var/run/hal:/bin/false" \
         >> /mnt/etc/passwd
@@ -314,20 +545,20 @@ if [ "x$start_dreshal" = "xyes" ]; then
     echo -n "" > /mnt/var/lib/PolicyKit/reload
     # set permissions with userid
     echo -e "\tchown haldaemon:haldaemon /var/run/hal /var/cache/hald \
-      2>/dev/null" >>/mnt/etc/${D_INITDIR}/boot.slx
+      2>/dev/null" >>/mnt/etc/init.d/boot.slx
     start=$(($start + 1))
     stop=$(($stop - 1))
     rllinker "haldaemon" $start $stop
   fi
 fi
 }
-# configure automounter (fixme: config version for NFSv4 might be required)
+# configure automounter (fixme: to be moved into plugin)
 config_automount () {
-if [ -e /mnt/etc/${D_SYSCONFDIR}/autofs ] ; then
+if [ -e /mnt/etc/sysconfig/autofs ] ; then
   testmkd /var/lock/subsys
-  sed -e "1i# /etc/${D_SYSCONFDIR}/autofs - file modified by\n#\t$0:\n#" \
+  sed -e "1i# /etc/sysconfig/autofs - file modified by\n#\t$0:\n#" \
       -e "s,AUTOFS_OPTIONS.*,AUTOFS_OPTIONS=\"--timeout 3\"," \
-      -i /mnt/etc/${D_SYSCONFDIR}/autofs
+      -i /mnt/etc/sysconfig/autofs
   rllinker "autofs" 18 4
 else
   error "$df_erramt" nonfatal
@@ -335,7 +566,7 @@ fi
 }
 # start name service caching daemon
 config_nscd () {
-if [ -e /mnt/etc/${D_INITDIR}/nscd ] ; then
+if [ -e /mnt/etc/init.d/nscd ] ; then
   testmkd /mnt/var/run/nscd
   rllinker "nscd" 16 16
 else
@@ -344,11 +575,11 @@ fi
 }
 # start portmapper (needed at least for nfs and nis services)
 config_portmap () {
-rllinker "portmap" 2 20
+  rllinker "portmap" 2 20
 }
-# start NIS
+# start NIS (mostly deprecated)
 config_nis () {
-if [ -f /mnt/etc/${D_INITDIR}/ypbind ] ; then
+if [ -f /mnt/etc/init.d/ypbind -a ] ; then
   rllinker "ypbind" 6 16
   config_portmap
   testmkd /mnt/var/yp/nicknames
@@ -365,26 +596,18 @@ local name="$2"
 local info="$3"
 case "$1" in
   init)
-    echo -e "#!/bin/sh\n# skeleton of /etc/${D_INITDIR}/$name created \
+    echo -e "#!/bin/sh\n# skeleton of /etc/init.d/${name} created \
 by $0\n# after you applied changes to the creation scripts you have to \
 rerun\n# the mkdxsinitrd script to get them applied\n\
-. /etc/rc.status\n. /etc/${D_SYSCONFDIR}/logfile\nrc_reset\ncase \
-\"\$1\" in\n    start)\n\techo -n \"$info\"" >>/mnt/etc/${D_INITDIR}/$name
-    chmod u+x /mnt/etc/${D_INITDIR}/$name
+. /etc/rc.status\n. /etc/sysconfig/logfile\nrc_reset\ncase \
+\"\$1\" in\n    start)\n\techo -n \"$info\"" >>/mnt/etc/init.d/${name}
+    chmod u+x /mnt/etc/init.d/${name}
   ;;
   close)
     echo -e "\trc_status -v\n\t;;\n    stop)\n\t;;\nesac\nrc_exit" \
-      >>/mnt/etc/${D_INITDIR}/$name
+      >>/mnt/etc/init.d/${name}
   ;;
 esac
 }
-# Xorg variable settings. Lots of stuff changed since 10.2
-displayvars () {
-Files='\tModulePath\t"/etc/X11/modules"\n
-\tModulePath\t"/usr/lib/xorg/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"'
-synapticsdrv="/usr/lib/xorg/modules/input/synaptics_drv.so"
-}
+