removed scilin completely, general network config for rhel based OSs

52 files changed, 92 insertions, 1212 deletions

diff --git a/src/initramfs/distro-specs/centos/functions-default b/src/initramfs/distro-specs/centos/functions-default
index 4e34c995..b6e9f4eb 100644
--- a/src/initramfs/distro-specs/centos/functions-default
+++ b/src/initramfs/distro-specs/centos/functions-default
@@ -26,7 +26,8 @@ D_RODIRSINRW="/etc/bootsplash /etc/gconf /var/adm /var/lib/texmf /var/lib/rpm \
 /var/cache/fontconfig"
 D_DIRINDXS="/var/lib/rpm /var/lib/nobody /var/lib/alternatives/ /var/db/nscd \
 /var/lib/bluetooth /var/lib/scrollkeeper /var/lib/nfs/sm /var/lib/nfs/sm.bak \
-/var/lib/misc /var/spool/cron"
+/var/lib/nfs/rpc_pipefs /mnt/var/lib/nfs/statd /var/run/netreport /var/lib/misc \
+/var/spool/cron"
 
 # empty functions are defined at the beginning of /etc/functions
 
@@ -46,8 +47,34 @@ config_distro () {
       -e "s/kernel.sysrq =.*/kernel.sysrq = 1/" -i /mnt/etc/sysctl.conf
   # set some networking stuff if needed
   [ -e /mnt/etc/sysconfig/network ] && \
-    sed -e "s/HOSTNAME=.*/HOSTNAME=$host_name/" \
+    sed -e "s/HOSTNAME=.*/HOSTNAME=$host_name.$domain/" \
         -e "s/GATEWAY=.*/GATEWAY=$gateway/" -i /mnt/etc/sysconfig/network
+  [ -e /mnt/etc/init.d/functions ] && \
+    sed -i "s,\(^__sed_discard_ignored_files.*\.rpmsave\)\(.*\),\1\\\|-eth0\2,"\
+        /mnt/etc/init.d/functions
+  testmkd /var/lib/nfs/rpc_pipefs
+  /mnt/var/lib/nfs/statd 700 rpcuser:rpcuser
+  /var/run/netreport
+# Create IP configurations
+  ## no grep -B 1 in busybox
+  #IFACES=$(ip a \
+  #  | grep -B 1 "/ether" \
+  #  | sed -r '/^--$/d;$!N;s#^[0-9]+: ([a-z0-9\.:]+): .*?/ether ([0-9a-fA-F:]+) .*$#\1=\2#')
+  IFS=$(ip a \
+    | awk '/^[0-9]+: /,/ brd /' \
+    | sed -r '$!N;s,\n,,' \
+    | grep -o '.*/ether .*' \
+    | sed -r 's#^[0-9]+: ([a-z0-9\.:]+): .*?/ether ([0-9a-fA-F:]+) .*$#\1=\2#')
+  for line in $IFS; do
+    IF=$(echo $line | cut -d= -f1)
+    IFMAC=$(echo $line | cut -d= -f2)
+    cat << EOF > "/mnt/etc/sysconfig/network-scripts/ifcfg-$IFACE"
+DEVICE=$IF
+HWADDR=$IFMAC
+BOOTPROTO=dhcp
+ONBOOT=no
+EOF
+done
   # check for inittab file
   #test -f /mnt/etc/inittab || error "$df_erritab"
 }
@@ -310,4 +337,3 @@ rerun\n# the mkdxsinitrd script to get them applied\n\
 esac
 }
 
-
diff --git a/src/initramfs/distro-specs/rhel/functions-default b/src/initramfs/distro-specs/rhel/functions-default
index 51e45af6..570c63f1 100644
--- a/src/initramfs/distro-specs/rhel/functions-default
+++ b/src/initramfs/distro-specs/rhel/functions-default
@@ -26,7 +26,8 @@ D_RODIRSINRW="/etc/bootsplash /etc/gconf /var/adm /var/lib/texmf /var/lib/rpm \
 /var/cache/fontconfig"
 D_DIRINDXS="/var/lib/rpm /var/lib/nobody /var/lib/alternatives/ /var/db/nscd \
 /var/lib/bluetooth /var/lib/scrollkeeper /var/lib/nfs/sm /var/lib/nfs/sm.bak \
-/var/lib/misc /var/spool/cron"
+/var/lib/nfs/rpc_pipefs /mnt/var/lib/nfs/statd /var/run/netreport /var/lib/misc \
+/var/spool/cron"
 
 # empty functions are defined at the beginning of /etc/functions
 
@@ -46,13 +47,36 @@ config_distro () {
       -e "s/kernel.sysrq =.*/kernel.sysrq = 1/" -i /mnt/etc/sysctl.conf
   # set some networking stuff if needed
   [ -e /mnt/etc/sysconfig/network ] && \
-    sed -e "s/HOSTNAME=.*/HOSTNAME=$host_name/" \
+    sed -e "s/HOSTNAME=.*/HOSTNAME=$host_name.$domain/" \
         -e "s/GATEWAY=.*/GATEWAY=$gateway/" -i /mnt/etc/sysconfig/network
+  [ -e /mnt/etc/init.d/functions ] && \
+    sed -i "s,\(^__sed_discard_ignored_files.*\.rpmsave\)\(.*\),\1\\\|-eth0\2,"\
+        /mnt/etc/init.d/functions
+  testmkd /var/lib/nfs/rpc_pipefs
+  /mnt/var/lib/nfs/statd 700 rpcuser:rpcuser
+  /var/run/netreport
+# Create IP configurations
+  ## no grep -B 1 in busybox
+  #IFACES=$(ip a \
+  #  | grep -B 1 "/ether" \
+  #  | sed -r '/^--$/d;$!N;s#^[0-9]+: ([a-z0-9\.:]+): .*?/ether ([0-9a-fA-F:]+) .*$#\1=\2#')
+  IFS=$(ip a \
+    | awk '/^[0-9]+: /,/ brd /' \
+    | sed -r '$!N;s,\n,,' \
+    | grep -o '.*/ether .*' \
+    | sed -r 's#^[0-9]+: ([a-z0-9\.:]+): .*?/ether ([0-9a-fA-F:]+) .*$#\1=\2#')
+  for line in $IFS; do
+    IF=$(echo $line | cut -d= -f1)
+    IFMAC=$(echo $line | cut -d= -f2)
+    cat << EOF > "/mnt/etc/sysconfig/network-scripts/ifcfg-$IFACE"
+DEVICE=$IF
+HWADDR=$IFMAC
+BOOTPROTO=dhcp
+ONBOOT=no
+EOF
+done
   # check for inittab file
   #test -f /mnt/etc/inittab || error "$df_erritab"
-
-# for screen sessions
-testmkd /mnt/var/run/uscreens 4777
 }
 
 # initial (boot time) runlevel scripts
@@ -313,4 +337,3 @@ rerun\n# the mkdxsinitrd script to get them applied\n\
 esac
 }
 
-
diff --git a/src/initramfs/distro-specs/scientific/functions-default b/src/initramfs/distro-specs/scientific/functions-default
index 4f8aa7de..264c1778 100644
--- a/src/initramfs/distro-specs/scientific/functions-default
+++ b/src/initramfs/distro-specs/scientific/functions-default
@@ -26,7 +26,8 @@ D_RODIRSINRW="/etc/bootsplash /etc/gconf /var/adm /var/lib/texmf /var/lib/rpm \
 /var/cache/fontconfig"
 D_DIRINDXS="/var/lib/rpm /var/lib/nobody /var/lib/alternatives/ /var/db/nscd \
 /var/lib/bluetooth /var/lib/scrollkeeper /var/lib/nfs/sm /var/lib/nfs/sm.bak \
-/var/lib/misc /var/spool/cron"
+/var/lib/nfs/rpc_pipefs /mnt/var/lib/nfs/statd /var/run/netreport /var/lib/misc \
+/var/spool/cron"
 
 # empty functions are defined at the beginning of /etc/functions
 
@@ -46,8 +47,34 @@ config_distro () {
       -e "s/kernel.sysrq =.*/kernel.sysrq = 1/" -i /mnt/etc/sysctl.conf
   # set some networking stuff if needed
   [ -e /mnt/etc/sysconfig/network ] && \
-    sed -e "s/HOSTNAME=.*/HOSTNAME=$host_name/" \
+    sed -e "s/HOSTNAME=.*/HOSTNAME=$host_name.$domain/" \
         -e "s/GATEWAY=.*/GATEWAY=$gateway/" -i /mnt/etc/sysconfig/network
+  [ -e /mnt/etc/init.d/functions ] && \
+    sed -i "s,\(^__sed_discard_ignored_files.*\.rpmsave\)\(.*\),\1\\\|-eth0\2,"\
+        /mnt/etc/init.d/functions
+  testmkd /var/lib/nfs/rpc_pipefs
+  /mnt/var/lib/nfs/statd 700 rpcuser:rpcuser
+  /var/run/netreport
+# Create IP configurations
+  ## no grep -B 1 in busybox
+  #IFACES=$(ip a \
+  #  | grep -B 1 "/ether" \
+  #  | sed -r '/^--$/d;$!N;s#^[0-9]+: ([a-z0-9\.:]+): .*?/ether ([0-9a-fA-F:]+) .*$#\1=\2#')
+  IFS=$(ip a \
+    | awk '/^[0-9]+: /,/ brd /' \
+    | sed -r '$!N;s,\n,,' \
+    | grep -o '.*/ether .*' \
+    | sed -r 's#^[0-9]+: ([a-z0-9\.:]+): .*?/ether ([0-9a-fA-F:]+) .*$#\1=\2#')
+  for line in $IFS; do
+    IF=$(echo $line | cut -d= -f1)
+    IFMAC=$(echo $line | cut -d= -f2)
+    cat << EOF > "/mnt/etc/sysconfig/network-scripts/ifcfg-$IFACE"
+DEVICE=$IF
+HWADDR=$IFMAC
+BOOTPROTO=dhcp
+ONBOOT=no
+EOF
+done
   # check for inittab file
   #test -f /mnt/etc/inittab || error "$df_erritab"
 }
@@ -310,4 +337,3 @@ rerun\n# the mkdxsinitrd script to get them applied\n\
 esac
 }
 
-
diff --git a/src/initramfs/distro-specs/scilin/functions-4.7 b/src/initramfs/distro-specs/scilin/functions-4.7
deleted file mode 100644
index e3ffe443..00000000
--- a/src/initramfs/distro-specs/scilin/functions-4.7
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright (c) 2009 - RZ Uni Freiburg
-#
-# 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 Scientific Linux (4.7) to setup linux stateless
-# clients (executed within initial ramfs)
-
-# nothing changed yet from default
-
diff --git a/src/initramfs/distro-specs/scilin/functions-5.3 b/src/initramfs/distro-specs/scilin/functions-5.3
deleted file mode 100644
index 1548ab9a..00000000
--- a/src/initramfs/distro-specs/scilin/functions-5.3
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright (c) 2009 - RZ Uni Freiburg
-#
-# 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 Scientific Linux (5.1) to setup linux stateless
-# clients (executed within initial ramfs)
-
-# initial (boot time) runlevel scripts
-initial_boot () {
-# delete all classical disk base rootfs stuff from rc.sysinit
-sed -e "6i# Script modified by $0 during stage3 bootup." \
-    -e "/relabel_se/,/^}/d" \
-    -e "/# Start up swap/,/# Set up bin/d" \
-    -e "/^remount_needed/,/^fi$/d" -e "/^# Clean out/,/in_sysinit/d" \
-    -e "/# Mount all o/,/# Start the g/d" \
-    -e "/# Boot time/,/# let's/d" -i /mnt/etc/rc.d/rc.sysinit
-# delete all classical disk base rootfs stuff from halt
-sed -e "7i#                Modified by $0 during stage3 bootup." \
-    -e "/# Save mixer/,/Saving random/d" -e "/quotaoff/,/^# Now halt/d" \
-    -i /mnt/etc/init.d/halt
-# boot.slx is a special runlevel script generated within initialramfs which
-# should be executed before the normal runlevel scripts.
-echo -e "# Run OpenSLX init runlevel script\n/etc/init.d/boot.slx" \
-  >>/mnt/etc/rc.d/rc.sysinit
-# switch off SElinux enforcing
-sed -e "1i# Configuration modified by $0 during stage3 bootup." \
-    -e "s/SELINUX=.*/SELINUX=permissive/" -i /mnt/etc/selinux/config
-# switch off display manager start via inittab
-sed -e "s/x:5:re.*/# line deleted in stage3, re-enable via desktop plugin/" \
-    -i /mnt/etc/inittab
-# link halt and reboot scripts
-ln -s ../init.d/killall /mnt/etc/rc.d/rc0.d/S00killall
-ln -s ../init.d/halt /mnt/etc/rc.d/rc0.d/S01halt
-ln -s ../init.d/killall /mnt/etc/rc.d/rc6.d/S00killall
-ln -s ../init.d/halt /mnt/etc/rc.d/rc6.d/S01reboot
-}
diff --git a/src/initramfs/distro-specs/scilin/functions-5.4 b/src/initramfs/distro-specs/scilin/functions-5.4
deleted file mode 100644
index 1548ab9a..00000000
--- a/src/initramfs/distro-specs/scilin/functions-5.4
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright (c) 2009 - RZ Uni Freiburg
-#
-# 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 Scientific Linux (5.1) to setup linux stateless
-# clients (executed within initial ramfs)
-
-# initial (boot time) runlevel scripts
-initial_boot () {
-# delete all classical disk base rootfs stuff from rc.sysinit
-sed -e "6i# Script modified by $0 during stage3 bootup." \
-    -e "/relabel_se/,/^}/d" \
-    -e "/# Start up swap/,/# Set up bin/d" \
-    -e "/^remount_needed/,/^fi$/d" -e "/^# Clean out/,/in_sysinit/d" \
-    -e "/# Mount all o/,/# Start the g/d" \
-    -e "/# Boot time/,/# let's/d" -i /mnt/etc/rc.d/rc.sysinit
-# delete all classical disk base rootfs stuff from halt
-sed -e "7i#                Modified by $0 during stage3 bootup." \
-    -e "/# Save mixer/,/Saving random/d" -e "/quotaoff/,/^# Now halt/d" \
-    -i /mnt/etc/init.d/halt
-# boot.slx is a special runlevel script generated within initialramfs which
-# should be executed before the normal runlevel scripts.
-echo -e "# Run OpenSLX init runlevel script\n/etc/init.d/boot.slx" \
-  >>/mnt/etc/rc.d/rc.sysinit
-# switch off SElinux enforcing
-sed -e "1i# Configuration modified by $0 during stage3 bootup." \
-    -e "s/SELINUX=.*/SELINUX=permissive/" -i /mnt/etc/selinux/config
-# switch off display manager start via inittab
-sed -e "s/x:5:re.*/# line deleted in stage3, re-enable via desktop plugin/" \
-    -i /mnt/etc/inittab
-# link halt and reboot scripts
-ln -s ../init.d/killall /mnt/etc/rc.d/rc0.d/S00killall
-ln -s ../init.d/halt /mnt/etc/rc.d/rc0.d/S01halt
-ln -s ../init.d/killall /mnt/etc/rc.d/rc6.d/S00killall
-ln -s ../init.d/halt /mnt/etc/rc.d/rc6.d/S01reboot
-}
diff --git a/src/initramfs/distro-specs/scilin/functions-5.5 b/src/initramfs/distro-specs/scilin/functions-5.5
deleted file mode 100644
index 1548ab9a..00000000
--- a/src/initramfs/distro-specs/scilin/functions-5.5
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright (c) 2009 - RZ Uni Freiburg
-#
-# 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 Scientific Linux (5.1) to setup linux stateless
-# clients (executed within initial ramfs)
-
-# initial (boot time) runlevel scripts
-initial_boot () {
-# delete all classical disk base rootfs stuff from rc.sysinit
-sed -e "6i# Script modified by $0 during stage3 bootup." \
-    -e "/relabel_se/,/^}/d" \
-    -e "/# Start up swap/,/# Set up bin/d" \
-    -e "/^remount_needed/,/^fi$/d" -e "/^# Clean out/,/in_sysinit/d" \
-    -e "/# Mount all o/,/# Start the g/d" \
-    -e "/# Boot time/,/# let's/d" -i /mnt/etc/rc.d/rc.sysinit
-# delete all classical disk base rootfs stuff from halt
-sed -e "7i#                Modified by $0 during stage3 bootup." \
-    -e "/# Save mixer/,/Saving random/d" -e "/quotaoff/,/^# Now halt/d" \
-    -i /mnt/etc/init.d/halt
-# boot.slx is a special runlevel script generated within initialramfs which
-# should be executed before the normal runlevel scripts.
-echo -e "# Run OpenSLX init runlevel script\n/etc/init.d/boot.slx" \
-  >>/mnt/etc/rc.d/rc.sysinit
-# switch off SElinux enforcing
-sed -e "1i# Configuration modified by $0 during stage3 bootup." \
-    -e "s/SELINUX=.*/SELINUX=permissive/" -i /mnt/etc/selinux/config
-# switch off display manager start via inittab
-sed -e "s/x:5:re.*/# line deleted in stage3, re-enable via desktop plugin/" \
-    -i /mnt/etc/inittab
-# link halt and reboot scripts
-ln -s ../init.d/killall /mnt/etc/rc.d/rc0.d/S00killall
-ln -s ../init.d/halt /mnt/etc/rc.d/rc0.d/S01halt
-ln -s ../init.d/killall /mnt/etc/rc.d/rc6.d/S00killall
-ln -s ../init.d/halt /mnt/etc/rc.d/rc6.d/S01reboot
-}
diff --git a/src/initramfs/distro-specs/scilin/functions-default b/src/initramfs/distro-specs/scilin/functions-default
deleted file mode 100644
index f9bb0f0e..00000000
--- a/src/initramfs/distro-specs/scilin/functions-default
+++ /dev/null
@@ -1,315 +0,0 @@
-# Copyright (c) 2003..2006 - RZ Uni Freiburg
-# Copyright (c) 2006..2010 - 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 general Scientific Linux to configure linux 
-# stateless clients (included by init, hwautocfg, servconfig within Initial-
-# RamFS after inclusion of the main functions file). This file is the main
-# base for the several RedHat based Scientific Linux versions.
-
-# settings of central variables
-# 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_BINDMPTS="tmp root media home"
-D_DIRINBINDMNT="/var/run /var/log /var/tmp"
-D_RODIRSINRW="/etc/bootsplash /etc/gconf /var/adm /var/lib/texmf /var/lib/rpm \
-/var/cache/fontconfig"
-D_DIRINDXS="/var/lib/rpm /var/lib/nobody /var/lib/alternatives/ /var/db/nscd \
-/var/lib/bluetooth /var/lib/scrollkeeper /var/lib/nfs/sm /var/lib/nfs/sm.bak \
-/var/lib/misc /var/spool/cron"
-
-# empty functions are defined at the beginning of /etc/functions
-
-# 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 ; do
-    rm -rf /mnt/etc/${dir}/*
-  done
-  # set some system/environment information
-  echo -e "SLX VERSION = $SLXVERSION\nINITRAMFS GENERATION DATE = $date" \
-    >>/mnt/etc/redhat-release
-  # simple bash configuration for root
-  echo -e "# Generated in OpenSLX stage3\n. /etc/bashrc" >/mnt/root/.profile
-  # enable sysrq
-  sed -e "1i# Configuration modified by $0 during stage3 bootup." \
-      -e "s/kernel.sysrq =.*/kernel.sysrq = 1/" -i /mnt/etc/sysctl.conf
-  # set some networking stuff if needed
-  [ -e /mnt/etc/sysconfig/network ] && \
-    sed -e "s/HOSTNAME=.*/HOSTNAME=$host_name/" \
-        -e "s/GATEWAY=.*/GATEWAY=$gateway/" -i /mnt/etc/sysconfig/network
-  # check for inittab file
-  #test -f /mnt/etc/inittab || error "$df_erritab"
-}
-
-# initial (boot time) runlevel scripts
-initial_boot () {
-# delete all classical disk base rootfs stuff from rc.sysinit
-sed -e "6i# Script modified by $0 during stage3 bootup." \
-    -e "/# Initialize ha/,/success/d" -e "/^ROOTFSTYPE/,/Remounting root/d" \
-    -e "/# Check f/,/Mounting l/d" -e "/^# Configure mach/,/-f \/fastboot/d" \
-    -e "s,/sbin/start_udev$,/etc/init.d/udevd," -i /mnt/etc/rc.d/rc.sysinit
-# write a custom udev script (to be checked!!)
-echo -e "#!/bin/sh\n# Simple udev starter script created as a replacement \
-during OpenSLX stage3\n# bootup." >/mnt/etc/init.d/udevd
-echo -e ". /etc/init.d/functions\nSTRING=\$\"Starting udev: \" \
-\necho -n \"\$STRING \"\n/sbin/udevstart </dev/null >/dev/null 2>&1 \
-\n[ \$? -eq 0 ] && success \$\"\$STRING\" || failure \$\"\$STRING\" \
-\nexit 0" >>/mnt/etc/init.d/udevd
-chmod u+x /mnt/etc/init.d/udevd
-# delete all classical disk base rootfs stuff from halt
-sed -e "7i#                Modified by $0 during stage3 bootup." \
-    -e "/# Save mixer/,/Saving random/d" -e "/quotaoff/,/^# Now halt/d" \
-    -i /mnt/etc/init.d/halt
-# boot.slx is a special runlevel script generated within initialramfs which
-# should be executed before the normal runlevel scripts.
-echo -e "# Run OpenSLX init runlevel script\n/etc/init.d/boot.slx" \
-  >>/mnt/etc/rc.d/rc.sysinit
-# switch off SElinux enforcing
-sed -e "1i# Configuration modified by $0 during stage3 bootup." \
-    -e "s/SELINUX=.*/SELINUX=permissive/" -i /mnt/etc/selinux/config
-# link halt and reboot scripts
-ln -s ../init.d/killall /mnt/etc/rc.d/rc0.d/S00killall
-ln -s ../init.d/halt /mnt/etc/rc.d/rc0.d/S01halt
-ln -s ../init.d/killall /mnt/etc/rc.d/rc6.d/S00killall
-ln -s ../init.d/halt /mnt/etc/rc.d/rc6.d/S01reboot
-}
-
-# linking runlevel scripts
-rllinker () {
-local script="$1"
-if [ $2 -lt 10 ] ; then
-  local start="0$2"; else local start="$2"
-fi
-if [ $3 -lt 10 ] ; then
-  local stop="0$3"; else local stop="$3"
-fi
-# empty runlevel links - decision on running certain services is 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 ../init.d/$script /mnt/etc/$i
-done
-}
-
-# group of functions for the normal runlevels - first parameter is start
-# second stop
-# function for ntp configuration
-config_ntp () {
-if [ -e /mnt/etc/init.d/ntpd ] ; then
-  if ! strinfile "ntp:" /mnt/etc/passwd ; then
-    echo -e "ntp:x:38:38:NTP daemon:/var/lib/ntp:/sbin/nologin" \
-      >>/mnt/etc/passwd
-    echo -e "ntp:!:13099:0:99999:7:::" >>/mnt/etc/shadow
-  fi
-  testmkd /mnt/var/lib/ntp ntp:ntp
-  if [ "x$start_ntp" = "xyes" ] ; then
-    rllinker "ntpd" 7 14
-  fi
-fi
-}
-# function for atd
-config_atd () {
-if [ "x$start_atd" = "xyes" ]; then
-  rllinker "atd" 14 4
-fi
-}
-# function for configuration of cron services
-config_cron () {
-if [ "x$start_cron" = "xyes" ] ; then
-  if [ -f /mnt/etc/init.d/cron ] ; then
-    rllinker "cron" 18 2
-    testmkd /mnt/var/spool/anacron
-    echo -e "# /etc/crontab - file generated by $0:\n\
-" >/mnt/etc/crontab
-  else
-    error "$df_errcron" nonfatal
-  fi 
-fi
-}
-# name service caching daemon (useful in most cases)
-config_nscd () {
-  if [ -f /mnt/etc/init.d/nscd ] ; then
-	testmkd /mnt/var/db/nscd
-    rllinker "nscd" 20 5
-  fi
-}
-# secure shell service
-config_sshd () {
-if [ "x$start_sshd" = "xyes" ] ; then
-  if [ -f /mnt/etc/init.d/sshd ] ; then
-    testmkd /mnt/var/empty/sshd/dev
-    if ! strinfile "sshd:" /mnt/etc/passwd ; then
-      echo -e "sshd:x:74:74::/var/empty/sshd:/sbin/nologin" \
-        >>/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
-}
-# snmp agent for remote monitoring
-config_snmp () {
-if [ "x$start_snmp" = "xyes" ] ; then
-  if [ -f /mnt/etc/init.d/snmpd ] ; then
-    rllinker "snmpd" 24 2
-    testmkd /mnt/var/lib/net-snmp
-  fi
-    # fixme!!
-    # write service monitor depending on services started
-  fi
-}
-# configure print server (lpd or cups)
-config_printer () {
-if [ "x${start_printdaemon}" != "x" ] && \
-  [ "x${start_printdaemon}" != "xno" ]; then
-  case ${start_printdaemon} in
-    yes|cups*|CUPS*)
-      rllinker "cups" 25 1
-      testmkd /mnt/var/spool/cups/tmp root:sys
-    ;;
-    lp*|LP*|PLP*)
-      rllinker "lpd" 25 1
-      testmkd /mnt/var/spool/lpd
-    ;;
-    *)
-    #logwrite "Do not know print-server $start_printdaemon; \
-    #specify 'cups' or 'lpd'."
-    ;;
-  esac
-fi   
-# configure cups printer client, avoid to overwrite admin provided printer
-# 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 bluetooth services
-config_bt () {
-if [ -e /mnt/etc/sysconfig/bluetooth ] ; then
-  sed -e "1i# /etc/sysconfig/bluetooth - file modified by $0" \
-      -e "s,HID2HCI_ENABLE.*,HID2HCI_ENABLE=true," \
-      -i /mnt/etc/sysconfig/bluetooth
-else
-  : # no bluetooth components installed
-fi
-}
-# 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/sysconfig/keyboard
-#echo -e "\tsetfont ${CONSOLE_FONT} >${LOGFILE} 2>&1\n" \
-#  >>/mnt/etc/init.d/boot.slx
-}
-# acpi and powersave daemons, required e.g. to shutdown the machine via
-# power button, no need for early start
-config_acpi () {
-rllinker acpid 01 22
-}
-# 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)
-# runlevel script for haldaemon is now haldaemon instead of hal
-config_dreshal () {
-local start=4
-local stop=18
-if [ "x$start_dreshal" = "xyes" ]; then
-  testmkd /mnt/var/run/dbus 
-  if [ -f /mnt/etc/init.d/messagebus ] ; then
-    testmkd /mnt/var/lib/dbus
-    strinfile "dbus:" /mnt/etc/passwd || \
-      echo "dbus:x:81:81:System Message Bus:/var/run/dbus:/sbin/nologin" \
-        >> /mnt/etc/passwd
-    strinfile "dbus:" /mnt/etc/group || echo "dbus:!:81:" >> /mnt/etc/group
-    rllinker "messagebus" $start $stop
-  fi
-  if [ -f /mnt/etc/init.d/haldaemon ] ; then
-    testmkd /mnt/var/lib/hal
-    strinfile "haldaemon:" /mnt/etc/passwd || \
-      echo "haldaemon:x:68:68:User for haldaemon:/var/run/hal:/sbin/nologin" \
-        >> /mnt/etc/passwd
-    strinfile "haldaemon:" /mnt/etc/group || \
-      echo "haldaemon:!:103:" >> /mnt/etc/group
-    start=$(($start + 1))
-    stop=$(($stop - 1))
-    rllinker "haldaemon" $start $stop
-  fi
-fi
-}
-# configure automounter (fixme: to be moved into plugin)
-config_automount () {
-if [ -e /mnt/etc/sysconfig/autofs ] ; then
-  testmkd /mnt/var/lock/subsys
-  sed -e "1i# /etc/sysconfig/autofs - file modified by\n#\t$0:\n#" \
-      -e "s,DAEMONOPTIONS.*,DAEMONOPTIONS=\"--timeout 3\"," \
-      -i /mnt/etc/sysconfig/autofs
-  rllinker "autofs" 18 4
-else
-  error "$df_erramt" nonfatal
-fi
-}
-# start name service caching daemon
-config_nscd () {
-if [ -e /mnt/etc/init.d/nscd ] ; then
-  testmkd /mnt/var/run/nscd
-  rllinker "nscd" 16 16
-else
-  error "$df_errnsc" nonfatal
-fi
-}
-# start portmapper (needed at least for nfs and nis services)
-config_portmap () {
-  rllinker "portmap" 2 20
-}
-# start NIS (mostly deprecated)
-config_nis () {
-if [ -f /mnt/etc/init.d/ypbind ] ; then
-  rllinker "ypbind" 6 16
-  config_portmap
-  testmkd /mnt/var/yp/nicknames
-else
-  error "$df_erryp" nonfatal
-fi
-}
-# initialize runlevel skript to be executed during system startup
-# (before most of the normal boot init scripts)
-# this script should operate like a normal runlevel script
-d_mkrlscript () {
-local switch="$1"
-local name="$2"
-local info="$3"
-case "$1" in
-  init)
-    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.d/init.d/functions\n#. /etc/sysconfig/logfile\ncase \
-\"\$1\" in\n    start)\n\techo -n \"$info\"" >>/mnt/etc/init.d/${name}
-    chmod u+x /mnt/etc/init.d/${name}
-  ;;
-  entry)
-    echo -e "\t${info}" >>/mnt/etc/init.d/${name}
-  ;;
-  close)
-    echo -e "\t;;\n    stop)\n\t;;\nesac" \
-      >>/mnt/etc/init.d/${name}
-  ;;
-esac
-}
-
-
diff --git a/src/installer/OpenSLX/OSExport/Distro/Rhel.pm b/src/installer/OpenSLX/OSExport/Distro/Rhel.pm
index d56f220f..fb56a98d 100644
--- a/src/installer/OpenSLX/OSExport/Distro/Rhel.pm
+++ b/src/installer/OpenSLX/OSExport/Distro/Rhel.pm
@@ -50,9 +50,14 @@ sub initDistroInfo
         - /etc/netplug*
         - /etc/*ppp*
         - /etc/*pptp*
+        - /etc/*~
+        - /etc/*bak
+        - /etc/*orig
         - /etc/*rpmnew
         - /etc/*rpmorig
+        - /etc/*rpmsave
         - /etc/sysconfig/network-scripts/ifcfg-*
+        + /etc/sysconfig/network-scripts/ifcfg-lo
         - /etc/X11/xkb
         + /lib/modules/*/misc/vmblock.o
         + /lib/modules/*/misc/vmmon.o
diff --git a/src/lib/distro-info/scilin-4.7/export-filter.example b/src/lib/distro-info/scilin-4.7/export-filter.example
deleted file mode 100644
index a414fef4..00000000
--- a/src/lib/distro-info/scilin-4.7/export-filter.example
+++ /dev/null
@@ -1,15 +0,0 @@
-# this file defines the filter rules used when exporting a vendor-OS
-# of this distro
-#
-# copy this file to 'export-filter' and add your own filters to it
-# in order to overrule the filters provided by openslx
-#
-#Examples:
-#     the following line would include anything below /var/spool/
-#+ /var/spool/*
-#
-#     this would exclude anything in /etc that starts with dhcpd.conf
-#- /etc/dhcpd.conf*
-#
-#     and this would exclude all rpmnew-files:
-#- *.rpmnew
diff --git a/src/lib/distro-info/scilin-4.7/prereqfiles/etc/group b/src/lib/distro-info/scilin-4.7/prereqfiles/etc/group
deleted file mode 100644
index 505cb221..00000000
--- a/src/lib/distro-info/scilin-4.7/prereqfiles/etc/group
+++ /dev/null
@@ -1,33 +0,0 @@
-root:x:0:
-bin:x:1:daemon
-daemon:x:2:
-sys:x:3:
-tty:x:5:
-disk:x:6:
-lp:x:7:
-www:x:8:
-kmem:x:9:
-wheel:x:10:
-mail:x:12:
-news:x:13:
-uucp:x:14:
-shadow:x:15:
-dialout:x:16:
-audio:x:17:
-floppy:x:19:
-cdrom:x:20:
-console:x:21:
-utmp:x:22:
-public:x:32:
-video:x:33:
-games:x:40:
-xok:x:41:
-trusted:x:42:
-modem:x:43:
-ftp:x:49:
-man:x:62:
-users:x:100:
-nobody:x:65533:
-nogroup:x:65534:nobody
-messagebus:!:101:
-haldaemon:!:102:
diff --git a/src/lib/distro-info/scilin-4.7/prereqfiles/etc/hosts b/src/lib/distro-info/scilin-4.7/prereqfiles/etc/hosts
deleted file mode 100644
index 75721cd5..00000000
--- a/src/lib/distro-info/scilin-4.7/prereqfiles/etc/hosts
+++ /dev/null
@@ -1 +0,0 @@
-127.0.0.1 localhost
diff --git a/src/lib/distro-info/scilin-4.7/prereqfiles/etc/passwd b/src/lib/distro-info/scilin-4.7/prereqfiles/etc/passwd
deleted file mode 100644
index 9b8fc4fe..00000000
--- a/src/lib/distro-info/scilin-4.7/prereqfiles/etc/passwd
+++ /dev/null
@@ -1,14 +0,0 @@
-root:x:0:0:root:/root:/bin/bash
-bin:x:1:1:bin:/bin:/bin/bash
-daemon:x:2:2:Daemon:/sbin:/bin/bash
-lp:x:4:7:Printing daemon:/var/spool/lpd:/bin/bash
-mail:x:8:12:Mailer daemon:/var/spool/clientmqueue:/bin/false
-news:x:9:13:News system:/etc/news:/bin/bash
-uucp:x:10:14:Unix-to-Unix CoPy system:/etc/uucp:/bin/bash
-games:x:12:100:Games account:/var/games:/bin/bash
-man:x:13:62:Manual pages viewer:/var/cache/man:/bin/bash
-wwwrun:x:30:8:WWW daemon apache:/var/lib/wwwrun:/bin/false
-ftp:x:40:49:FTP account:/srv/ftp:/bin/bash
-nobody:x:65534:65533:nobody:/var/lib/nobody:/bin/bash
-messagebus:x:100:101:User for D-Bus:/var/run/dbus:/bin/false
-haldaemon:x:101:102:User for haldaemon:/var/run/hal:/bin/false
diff --git a/src/lib/distro-info/scilin-4.7/prereqfiles/etc/shadow b/src/lib/distro-info/scilin-4.7/prereqfiles/etc/shadow
deleted file mode 100644
index cd100a5a..00000000
--- a/src/lib/distro-info/scilin-4.7/prereqfiles/etc/shadow
+++ /dev/null
@@ -1,14 +0,0 @@
-root::13481::::::
-bin:*:13481::::::
-daemon:*:13481::::::
-lp:*:13481::::::
-mail:*:13481::::::
-news:*:13481::::::
-uucp:*:13481::::::
-games:*:13481::::::
-man:*:13481::::::
-wwwrun:*:13481::::::
-ftp:*:13481::::::
-nobody:*:13481::::::
-messagebus:!:13481:0::7:::
-haldaemon:!:13481:0::7:::
diff --git a/src/lib/distro-info/scilin-4.7/settings.default b/src/lib/distro-info/scilin-4.7/settings.default
deleted file mode 100644
index 79f006fc..00000000
--- a/src/lib/distro-info/scilin-4.7/settings.default
+++ /dev/null
@@ -1,30 +0,0 @@
-bootstrap-packages = <<END
-    to-be-filled-in (List of base RPMs)
-END
-<metapackager yum>
-    packages = <<END
-        to-be-filled-in (List of RPMs for the YUM packager)
-    END
-</metapackager>
-package-subdir = ???
-prereq-packages = <<END
-    to-be-filled-in (List of needed RPMs)
-END
-<repository base>
-    name = Scientific Linux 4.7
-    repo-subdir = ?
-    file-for-speedtest = ?
-</repository>
-<selection minimal>
-    packages = <<END
-        glibc-locale
-    END
-</selection>
-<selection kde>
-    base = minimal
-    packages = <<END
-    END
-</selection>
-<selection default>
-    base = minimal
-</selection>
diff --git a/src/lib/distro-info/scilin-4.7/settings.example b/src/lib/distro-info/scilin-4.7/settings.example
deleted file mode 100644
index 5ae02428..00000000
--- a/src/lib/distro-info/scilin-4.7/settings.example
+++ /dev/null
@@ -1,17 +0,0 @@
-# rename this file to 'settings' and edit it as you please
-# 
-# for a list of all options, have a look at the corresponding 
-# settings.default in /opt/openslx/share/distro-info
-
-# use local installation source
-#<repository base>
-#    local-url = /srv/ftp/pub/some-distribution/inst-source
-#</repository>
-
-# add a new selection:
-#<selection my_number_crunsher>
-#    base = minimal
-#    packages = <<END
-#        crunsher_app
-#    END
-#</selection>
diff --git a/src/lib/distro-info/scilin-5.3/export-filter.example b/src/lib/distro-info/scilin-5.3/export-filter.example
deleted file mode 100644
index a414fef4..00000000
--- a/src/lib/distro-info/scilin-5.3/export-filter.example
+++ /dev/null
@@ -1,15 +0,0 @@
-# this file defines the filter rules used when exporting a vendor-OS
-# of this distro
-#
-# copy this file to 'export-filter' and add your own filters to it
-# in order to overrule the filters provided by openslx
-#
-#Examples:
-#     the following line would include anything below /var/spool/
-#+ /var/spool/*
-#
-#     this would exclude anything in /etc that starts with dhcpd.conf
-#- /etc/dhcpd.conf*
-#
-#     and this would exclude all rpmnew-files:
-#- *.rpmnew
diff --git a/src/lib/distro-info/scilin-5.3/prereqfiles/etc/group b/src/lib/distro-info/scilin-5.3/prereqfiles/etc/group
deleted file mode 100644
index 505cb221..00000000
--- a/src/lib/distro-info/scilin-5.3/prereqfiles/etc/group
+++ /dev/null
@@ -1,33 +0,0 @@
-root:x:0:
-bin:x:1:daemon
-daemon:x:2:
-sys:x:3:
-tty:x:5:
-disk:x:6:
-lp:x:7:
-www:x:8:
-kmem:x:9:
-wheel:x:10:
-mail:x:12:
-news:x:13:
-uucp:x:14:
-shadow:x:15:
-dialout:x:16:
-audio:x:17:
-floppy:x:19:
-cdrom:x:20:
-console:x:21:
-utmp:x:22:
-public:x:32:
-video:x:33:
-games:x:40:
-xok:x:41:
-trusted:x:42:
-modem:x:43:
-ftp:x:49:
-man:x:62:
-users:x:100:
-nobody:x:65533:
-nogroup:x:65534:nobody
-messagebus:!:101:
-haldaemon:!:102:
diff --git a/src/lib/distro-info/scilin-5.3/prereqfiles/etc/hosts b/src/lib/distro-info/scilin-5.3/prereqfiles/etc/hosts
deleted file mode 100644
index 75721cd5..00000000
--- a/src/lib/distro-info/scilin-5.3/prereqfiles/etc/hosts
+++ /dev/null
@@ -1 +0,0 @@
-127.0.0.1 localhost
diff --git a/src/lib/distro-info/scilin-5.3/prereqfiles/etc/passwd b/src/lib/distro-info/scilin-5.3/prereqfiles/etc/passwd
deleted file mode 100644
index 9b8fc4fe..00000000
--- a/src/lib/distro-info/scilin-5.3/prereqfiles/etc/passwd
+++ /dev/null
@@ -1,14 +0,0 @@
-root:x:0:0:root:/root:/bin/bash
-bin:x:1:1:bin:/bin:/bin/bash
-daemon:x:2:2:Daemon:/sbin:/bin/bash
-lp:x:4:7:Printing daemon:/var/spool/lpd:/bin/bash
-mail:x:8:12:Mailer daemon:/var/spool/clientmqueue:/bin/false
-news:x:9:13:News system:/etc/news:/bin/bash
-uucp:x:10:14:Unix-to-Unix CoPy system:/etc/uucp:/bin/bash
-games:x:12:100:Games account:/var/games:/bin/bash
-man:x:13:62:Manual pages viewer:/var/cache/man:/bin/bash
-wwwrun:x:30:8:WWW daemon apache:/var/lib/wwwrun:/bin/false
-ftp:x:40:49:FTP account:/srv/ftp:/bin/bash
-nobody:x:65534:65533:nobody:/var/lib/nobody:/bin/bash
-messagebus:x:100:101:User for D-Bus:/var/run/dbus:/bin/false
-haldaemon:x:101:102:User for haldaemon:/var/run/hal:/bin/false
diff --git a/src/lib/distro-info/scilin-5.3/prereqfiles/etc/shadow b/src/lib/distro-info/scilin-5.3/prereqfiles/etc/shadow
deleted file mode 100644
index cd100a5a..00000000
--- a/src/lib/distro-info/scilin-5.3/prereqfiles/etc/shadow
+++ /dev/null
@@ -1,14 +0,0 @@
-root::13481::::::
-bin:*:13481::::::
-daemon:*:13481::::::
-lp:*:13481::::::
-mail:*:13481::::::
-news:*:13481::::::
-uucp:*:13481::::::
-games:*:13481::::::
-man:*:13481::::::
-wwwrun:*:13481::::::
-ftp:*:13481::::::
-nobody:*:13481::::::
-messagebus:!:13481:0::7:::
-haldaemon:!:13481:0::7:::
diff --git a/src/lib/distro-info/scilin-5.3/settings.default b/src/lib/distro-info/scilin-5.3/settings.default
deleted file mode 100644
index 9f964927..00000000
--- a/src/lib/distro-info/scilin-5.3/settings.default
+++ /dev/null
@@ -1,30 +0,0 @@
-bootstrap-packages = <<END
-    to-be-filled-in (List of base RPMs)
-END
-<metapackager yum>
-    packages = <<END
-        to-be-filled-in (List of RPMs for the YUM packager)
-    END
-</metapackager>
-package-subdir = ???
-prereq-packages = <<END
-    to-be-filled-in (List of needed RPMs)
-END
-<repository base>
-    name = Scientific Linux 5.3
-    repo-subdir = ?
-    file-for-speedtest = ?
-</repository>
-<selection minimal>
-    packages = <<END
-        glibc-locale
-    END
-</selection>
-<selection kde>
-    base = minimal
-    packages = <<END
-    END
-</selection>
-<selection default>
-    base = minimal
-</selection>
diff --git a/src/lib/distro-info/scilin-5.3/settings.example b/src/lib/distro-info/scilin-5.3/settings.example
deleted file mode 100644
index 5ae02428..00000000
--- a/src/lib/distro-info/scilin-5.3/settings.example
+++ /dev/null
@@ -1,17 +0,0 @@
-# rename this file to 'settings' and edit it as you please
-# 
-# for a list of all options, have a look at the corresponding 
-# settings.default in /opt/openslx/share/distro-info
-
-# use local installation source
-#<repository base>
-#    local-url = /srv/ftp/pub/some-distribution/inst-source
-#</repository>
-
-# add a new selection:
-#<selection my_number_crunsher>
-#    base = minimal
-#    packages = <<END
-#        crunsher_app
-#    END
-#</selection>
diff --git a/src/lib/distro-info/scilin-5.4/export-filter.example b/src/lib/distro-info/scilin-5.4/export-filter.example
deleted file mode 100644
index a414fef4..00000000
--- a/src/lib/distro-info/scilin-5.4/export-filter.example
+++ /dev/null
@@ -1,15 +0,0 @@
-# this file defines the filter rules used when exporting a vendor-OS
-# of this distro
-#
-# copy this file to 'export-filter' and add your own filters to it
-# in order to overrule the filters provided by openslx
-#
-#Examples:
-#     the following line would include anything below /var/spool/
-#+ /var/spool/*
-#
-#     this would exclude anything in /etc that starts with dhcpd.conf
-#- /etc/dhcpd.conf*
-#
-#     and this would exclude all rpmnew-files:
-#- *.rpmnew
diff --git a/src/lib/distro-info/scilin-5.4/prereqfiles/etc/group b/src/lib/distro-info/scilin-5.4/prereqfiles/etc/group
deleted file mode 100644
index 505cb221..00000000
--- a/src/lib/distro-info/scilin-5.4/prereqfiles/etc/group
+++ /dev/null
@@ -1,33 +0,0 @@
-root:x:0:
-bin:x:1:daemon
-daemon:x:2:
-sys:x:3:
-tty:x:5:
-disk:x:6:
-lp:x:7:
-www:x:8:
-kmem:x:9:
-wheel:x:10:
-mail:x:12:
-news:x:13:
-uucp:x:14:
-shadow:x:15:
-dialout:x:16:
-audio:x:17:
-floppy:x:19:
-cdrom:x:20:
-console:x:21:
-utmp:x:22:
-public:x:32:
-video:x:33:
-games:x:40:
-xok:x:41:
-trusted:x:42:
-modem:x:43:
-ftp:x:49:
-man:x:62:
-users:x:100:
-nobody:x:65533:
-nogroup:x:65534:nobody
-messagebus:!:101:
-haldaemon:!:102:
diff --git a/src/lib/distro-info/scilin-5.4/prereqfiles/etc/hosts b/src/lib/distro-info/scilin-5.4/prereqfiles/etc/hosts
deleted file mode 100644
index 75721cd5..00000000
--- a/src/lib/distro-info/scilin-5.4/prereqfiles/etc/hosts
+++ /dev/null
@@ -1 +0,0 @@
-127.0.0.1 localhost
diff --git a/src/lib/distro-info/scilin-5.4/prereqfiles/etc/passwd b/src/lib/distro-info/scilin-5.4/prereqfiles/etc/passwd
deleted file mode 100644
index 9b8fc4fe..00000000
--- a/src/lib/distro-info/scilin-5.4/prereqfiles/etc/passwd
+++ /dev/null
@@ -1,14 +0,0 @@
-root:x:0:0:root:/root:/bin/bash
-bin:x:1:1:bin:/bin:/bin/bash
-daemon:x:2:2:Daemon:/sbin:/bin/bash
-lp:x:4:7:Printing daemon:/var/spool/lpd:/bin/bash
-mail:x:8:12:Mailer daemon:/var/spool/clientmqueue:/bin/false
-news:x:9:13:News system:/etc/news:/bin/bash
-uucp:x:10:14:Unix-to-Unix CoPy system:/etc/uucp:/bin/bash
-games:x:12:100:Games account:/var/games:/bin/bash
-man:x:13:62:Manual pages viewer:/var/cache/man:/bin/bash
-wwwrun:x:30:8:WWW daemon apache:/var/lib/wwwrun:/bin/false
-ftp:x:40:49:FTP account:/srv/ftp:/bin/bash
-nobody:x:65534:65533:nobody:/var/lib/nobody:/bin/bash
-messagebus:x:100:101:User for D-Bus:/var/run/dbus:/bin/false
-haldaemon:x:101:102:User for haldaemon:/var/run/hal:/bin/false
diff --git a/src/lib/distro-info/scilin-5.4/prereqfiles/etc/shadow b/src/lib/distro-info/scilin-5.4/prereqfiles/etc/shadow
deleted file mode 100644
index cd100a5a..00000000
--- a/src/lib/distro-info/scilin-5.4/prereqfiles/etc/shadow
+++ /dev/null
@@ -1,14 +0,0 @@
-root::13481::::::
-bin:*:13481::::::
-daemon:*:13481::::::
-lp:*:13481::::::
-mail:*:13481::::::
-news:*:13481::::::
-uucp:*:13481::::::
-games:*:13481::::::
-man:*:13481::::::
-wwwrun:*:13481::::::
-ftp:*:13481::::::
-nobody:*:13481::::::
-messagebus:!:13481:0::7:::
-haldaemon:!:13481:0::7:::
diff --git a/src/lib/distro-info/scilin-5.4/settings.default b/src/lib/distro-info/scilin-5.4/settings.default
deleted file mode 100644
index 5b86aab9..00000000
--- a/src/lib/distro-info/scilin-5.4/settings.default
+++ /dev/null
@@ -1,30 +0,0 @@
-bootstrap-packages = <<END
-    to-be-filled-in (List of base RPMs)
-END
-<metapackager yum>
-    packages = <<END
-        to-be-filled-in (List of RPMs for the YUM packager)
-    END
-</metapackager>
-package-subdir = ???
-prereq-packages = <<END
-    to-be-filled-in (List of needed RPMs)
-END
-<repository base>
-    name = Scientific Linux 5.4
-    repo-subdir = ?
-    file-for-speedtest = ?
-</repository>
-<selection minimal>
-    packages = <<END
-        glibc-locale
-    END
-</selection>
-<selection kde>
-    base = minimal
-    packages = <<END
-    END
-</selection>
-<selection default>
-    base = minimal
-</selection>
diff --git a/src/lib/distro-info/scilin-5.4/settings.example b/src/lib/distro-info/scilin-5.4/settings.example
deleted file mode 100644
index 5ae02428..00000000
--- a/src/lib/distro-info/scilin-5.4/settings.example
+++ /dev/null
@@ -1,17 +0,0 @@
-# rename this file to 'settings' and edit it as you please
-# 
-# for a list of all options, have a look at the corresponding 
-# settings.default in /opt/openslx/share/distro-info
-
-# use local installation source
-#<repository base>
-#    local-url = /srv/ftp/pub/some-distribution/inst-source
-#</repository>
-
-# add a new selection:
-#<selection my_number_crunsher>
-#    base = minimal
-#    packages = <<END
-#        crunsher_app
-#    END
-#</selection>
diff --git a/src/lib/distro-info/scilin-5.4_x86_64/export-filter.example b/src/lib/distro-info/scilin-5.4_x86_64/export-filter.example
deleted file mode 100644
index a414fef4..00000000
--- a/src/lib/distro-info/scilin-5.4_x86_64/export-filter.example
+++ /dev/null
@@ -1,15 +0,0 @@
-# this file defines the filter rules used when exporting a vendor-OS
-# of this distro
-#
-# copy this file to 'export-filter' and add your own filters to it
-# in order to overrule the filters provided by openslx
-#
-#Examples:
-#     the following line would include anything below /var/spool/
-#+ /var/spool/*
-#
-#     this would exclude anything in /etc that starts with dhcpd.conf
-#- /etc/dhcpd.conf*
-#
-#     and this would exclude all rpmnew-files:
-#- *.rpmnew
diff --git a/src/lib/distro-info/scilin-5.4_x86_64/prereqfiles/etc/group b/src/lib/distro-info/scilin-5.4_x86_64/prereqfiles/etc/group
deleted file mode 100644
index 505cb221..00000000
--- a/src/lib/distro-info/scilin-5.4_x86_64/prereqfiles/etc/group
+++ /dev/null
@@ -1,33 +0,0 @@
-root:x:0:
-bin:x:1:daemon
-daemon:x:2:
-sys:x:3:
-tty:x:5:
-disk:x:6:
-lp:x:7:
-www:x:8:
-kmem:x:9:
-wheel:x:10:
-mail:x:12:
-news:x:13:
-uucp:x:14:
-shadow:x:15:
-dialout:x:16:
-audio:x:17:
-floppy:x:19:
-cdrom:x:20:
-console:x:21:
-utmp:x:22:
-public:x:32:
-video:x:33:
-games:x:40:
-xok:x:41:
-trusted:x:42:
-modem:x:43:
-ftp:x:49:
-man:x:62:
-users:x:100:
-nobody:x:65533:
-nogroup:x:65534:nobody
-messagebus:!:101:
-haldaemon:!:102:
diff --git a/src/lib/distro-info/scilin-5.4_x86_64/prereqfiles/etc/hosts b/src/lib/distro-info/scilin-5.4_x86_64/prereqfiles/etc/hosts
deleted file mode 100644
index 75721cd5..00000000
--- a/src/lib/distro-info/scilin-5.4_x86_64/prereqfiles/etc/hosts
+++ /dev/null
@@ -1 +0,0 @@
-127.0.0.1 localhost
diff --git a/src/lib/distro-info/scilin-5.4_x86_64/prereqfiles/etc/passwd b/src/lib/distro-info/scilin-5.4_x86_64/prereqfiles/etc/passwd
deleted file mode 100644
index 9b8fc4fe..00000000
--- a/src/lib/distro-info/scilin-5.4_x86_64/prereqfiles/etc/passwd
+++ /dev/null
@@ -1,14 +0,0 @@
-root:x:0:0:root:/root:/bin/bash
-bin:x:1:1:bin:/bin:/bin/bash
-daemon:x:2:2:Daemon:/sbin:/bin/bash
-lp:x:4:7:Printing daemon:/var/spool/lpd:/bin/bash
-mail:x:8:12:Mailer daemon:/var/spool/clientmqueue:/bin/false
-news:x:9:13:News system:/etc/news:/bin/bash
-uucp:x:10:14:Unix-to-Unix CoPy system:/etc/uucp:/bin/bash
-games:x:12:100:Games account:/var/games:/bin/bash
-man:x:13:62:Manual pages viewer:/var/cache/man:/bin/bash
-wwwrun:x:30:8:WWW daemon apache:/var/lib/wwwrun:/bin/false
-ftp:x:40:49:FTP account:/srv/ftp:/bin/bash
-nobody:x:65534:65533:nobody:/var/lib/nobody:/bin/bash
-messagebus:x:100:101:User for D-Bus:/var/run/dbus:/bin/false
-haldaemon:x:101:102:User for haldaemon:/var/run/hal:/bin/false
diff --git a/src/lib/distro-info/scilin-5.4_x86_64/prereqfiles/etc/shadow b/src/lib/distro-info/scilin-5.4_x86_64/prereqfiles/etc/shadow
deleted file mode 100644
index cd100a5a..00000000
--- a/src/lib/distro-info/scilin-5.4_x86_64/prereqfiles/etc/shadow
+++ /dev/null
@@ -1,14 +0,0 @@
-root::13481::::::
-bin:*:13481::::::
-daemon:*:13481::::::
-lp:*:13481::::::
-mail:*:13481::::::
-news:*:13481::::::
-uucp:*:13481::::::
-games:*:13481::::::
-man:*:13481::::::
-wwwrun:*:13481::::::
-ftp:*:13481::::::
-nobody:*:13481::::::
-messagebus:!:13481:0::7:::
-haldaemon:!:13481:0::7:::
diff --git a/src/lib/distro-info/scilin-5.4_x86_64/settings.default b/src/lib/distro-info/scilin-5.4_x86_64/settings.default
deleted file mode 100644
index fdc4f5f4..00000000
--- a/src/lib/distro-info/scilin-5.4_x86_64/settings.default
+++ /dev/null
@@ -1,30 +0,0 @@
-bootstrap-packages = <<END
-    to-be-filled-in (List of base RPMs)
-END
-<metapackager yum>
-    packages = <<END
-        to-be-filled-in (List of RPMs for the YUM packager)
-    END
-</metapackager>
-package-subdir = ???
-prereq-packages = <<END
-    to-be-filled-in (List of needed RPMs)
-END
-<repository base>
-    name = Scientific Linux 5.4 64Bit
-    repo-subdir = ?
-    file-for-speedtest = ?
-</repository>
-<selection minimal>
-    packages = <<END
-        glibc-locale
-    END
-</selection>
-<selection kde>
-    base = minimal
-    packages = <<END
-    END
-</selection>
-<selection default>
-    base = minimal
-</selection>
diff --git a/src/lib/distro-info/scilin-5.4_x86_64/settings.example b/src/lib/distro-info/scilin-5.4_x86_64/settings.example
deleted file mode 100644
index 5ae02428..00000000
--- a/src/lib/distro-info/scilin-5.4_x86_64/settings.example
+++ /dev/null
@@ -1,17 +0,0 @@
-# rename this file to 'settings' and edit it as you please
-# 
-# for a list of all options, have a look at the corresponding 
-# settings.default in /opt/openslx/share/distro-info
-
-# use local installation source
-#<repository base>
-#    local-url = /srv/ftp/pub/some-distribution/inst-source
-#</repository>
-
-# add a new selection:
-#<selection my_number_crunsher>
-#    base = minimal
-#    packages = <<END
-#        crunsher_app
-#    END
-#</selection>
diff --git a/src/lib/distro-info/scilin-5.5/export-filter.example b/src/lib/distro-info/scilin-5.5/export-filter.example
deleted file mode 100644
index a414fef4..00000000
--- a/src/lib/distro-info/scilin-5.5/export-filter.example
+++ /dev/null
@@ -1,15 +0,0 @@
-# this file defines the filter rules used when exporting a vendor-OS
-# of this distro
-#
-# copy this file to 'export-filter' and add your own filters to it
-# in order to overrule the filters provided by openslx
-#
-#Examples:
-#     the following line would include anything below /var/spool/
-#+ /var/spool/*
-#
-#     this would exclude anything in /etc that starts with dhcpd.conf
-#- /etc/dhcpd.conf*
-#
-#     and this would exclude all rpmnew-files:
-#- *.rpmnew
diff --git a/src/lib/distro-info/scilin-5.5/prereqfiles/etc/group b/src/lib/distro-info/scilin-5.5/prereqfiles/etc/group
deleted file mode 100644
index 505cb221..00000000
--- a/src/lib/distro-info/scilin-5.5/prereqfiles/etc/group
+++ /dev/null
@@ -1,33 +0,0 @@
-root:x:0:
-bin:x:1:daemon
-daemon:x:2:
-sys:x:3:
-tty:x:5:
-disk:x:6:
-lp:x:7:
-www:x:8:
-kmem:x:9:
-wheel:x:10:
-mail:x:12:
-news:x:13:
-uucp:x:14:
-shadow:x:15:
-dialout:x:16:
-audio:x:17:
-floppy:x:19:
-cdrom:x:20:
-console:x:21:
-utmp:x:22:
-public:x:32:
-video:x:33:
-games:x:40:
-xok:x:41:
-trusted:x:42:
-modem:x:43:
-ftp:x:49:
-man:x:62:
-users:x:100:
-nobody:x:65533:
-nogroup:x:65534:nobody
-messagebus:!:101:
-haldaemon:!:102:
diff --git a/src/lib/distro-info/scilin-5.5/prereqfiles/etc/hosts b/src/lib/distro-info/scilin-5.5/prereqfiles/etc/hosts
deleted file mode 100644
index 75721cd5..00000000
--- a/src/lib/distro-info/scilin-5.5/prereqfiles/etc/hosts
+++ /dev/null
@@ -1 +0,0 @@
-127.0.0.1 localhost
diff --git a/src/lib/distro-info/scilin-5.5/prereqfiles/etc/passwd b/src/lib/distro-info/scilin-5.5/prereqfiles/etc/passwd
deleted file mode 100644
index 9b8fc4fe..00000000
--- a/src/lib/distro-info/scilin-5.5/prereqfiles/etc/passwd
+++ /dev/null
@@ -1,14 +0,0 @@
-root:x:0:0:root:/root:/bin/bash
-bin:x:1:1:bin:/bin:/bin/bash
-daemon:x:2:2:Daemon:/sbin:/bin/bash
-lp:x:4:7:Printing daemon:/var/spool/lpd:/bin/bash
-mail:x:8:12:Mailer daemon:/var/spool/clientmqueue:/bin/false
-news:x:9:13:News system:/etc/news:/bin/bash
-uucp:x:10:14:Unix-to-Unix CoPy system:/etc/uucp:/bin/bash
-games:x:12:100:Games account:/var/games:/bin/bash
-man:x:13:62:Manual pages viewer:/var/cache/man:/bin/bash
-wwwrun:x:30:8:WWW daemon apache:/var/lib/wwwrun:/bin/false
-ftp:x:40:49:FTP account:/srv/ftp:/bin/bash
-nobody:x:65534:65533:nobody:/var/lib/nobody:/bin/bash
-messagebus:x:100:101:User for D-Bus:/var/run/dbus:/bin/false
-haldaemon:x:101:102:User for haldaemon:/var/run/hal:/bin/false
diff --git a/src/lib/distro-info/scilin-5.5/prereqfiles/etc/shadow b/src/lib/distro-info/scilin-5.5/prereqfiles/etc/shadow
deleted file mode 100644
index cd100a5a..00000000
--- a/src/lib/distro-info/scilin-5.5/prereqfiles/etc/shadow
+++ /dev/null
@@ -1,14 +0,0 @@
-root::13481::::::
-bin:*:13481::::::
-daemon:*:13481::::::
-lp:*:13481::::::
-mail:*:13481::::::
-news:*:13481::::::
-uucp:*:13481::::::
-games:*:13481::::::
-man:*:13481::::::
-wwwrun:*:13481::::::
-ftp:*:13481::::::
-nobody:*:13481::::::
-messagebus:!:13481:0::7:::
-haldaemon:!:13481:0::7:::
diff --git a/src/lib/distro-info/scilin-5.5/settings.default b/src/lib/distro-info/scilin-5.5/settings.default
deleted file mode 100644
index 29996f63..00000000
--- a/src/lib/distro-info/scilin-5.5/settings.default
+++ /dev/null
@@ -1,30 +0,0 @@
-bootstrap-packages = <<END
-    to-be-filled-in (List of base RPMs)
-END
-<metapackager yum>
-    packages = <<END
-        to-be-filled-in (List of RPMs for the YUM packager)
-    END
-</metapackager>
-package-subdir = ???
-prereq-packages = <<END
-    to-be-filled-in (List of needed RPMs)
-END
-<repository base>
-    name = Scientific Linux 5.5
-    repo-subdir = ?
-    file-for-speedtest = ?
-</repository>
-<selection minimal>
-    packages = <<END
-        glibc-locale
-    END
-</selection>
-<selection kde>
-    base = minimal
-    packages = <<END
-    END
-</selection>
-<selection default>
-    base = minimal
-</selection>
diff --git a/src/lib/distro-info/scilin-5.5/settings.example b/src/lib/distro-info/scilin-5.5/settings.example
deleted file mode 100644
index 5ae02428..00000000
--- a/src/lib/distro-info/scilin-5.5/settings.example
+++ /dev/null
@@ -1,17 +0,0 @@
-# rename this file to 'settings' and edit it as you please
-# 
-# for a list of all options, have a look at the corresponding 
-# settings.default in /opt/openslx/share/distro-info
-
-# use local installation source
-#<repository base>
-#    local-url = /srv/ftp/pub/some-distribution/inst-source
-#</repository>
-
-# add a new selection:
-#<selection my_number_crunsher>
-#    base = minimal
-#    packages = <<END
-#        crunsher_app
-#    END
-#</selection>
diff --git a/src/lib/distro-info/scilin-5.5_x86_64/export-filter.example b/src/lib/distro-info/scilin-5.5_x86_64/export-filter.example
deleted file mode 100644
index a414fef4..00000000
--- a/src/lib/distro-info/scilin-5.5_x86_64/export-filter.example
+++ /dev/null
@@ -1,15 +0,0 @@
-# this file defines the filter rules used when exporting a vendor-OS
-# of this distro
-#
-# copy this file to 'export-filter' and add your own filters to it
-# in order to overrule the filters provided by openslx
-#
-#Examples:
-#     the following line would include anything below /var/spool/
-#+ /var/spool/*
-#
-#     this would exclude anything in /etc that starts with dhcpd.conf
-#- /etc/dhcpd.conf*
-#
-#     and this would exclude all rpmnew-files:
-#- *.rpmnew
diff --git a/src/lib/distro-info/scilin-5.5_x86_64/prereqfiles/etc/group b/src/lib/distro-info/scilin-5.5_x86_64/prereqfiles/etc/group
deleted file mode 100644
index 505cb221..00000000
--- a/src/lib/distro-info/scilin-5.5_x86_64/prereqfiles/etc/group
+++ /dev/null
@@ -1,33 +0,0 @@
-root:x:0:
-bin:x:1:daemon
-daemon:x:2:
-sys:x:3:
-tty:x:5:
-disk:x:6:
-lp:x:7:
-www:x:8:
-kmem:x:9:
-wheel:x:10:
-mail:x:12:
-news:x:13:
-uucp:x:14:
-shadow:x:15:
-dialout:x:16:
-audio:x:17:
-floppy:x:19:
-cdrom:x:20:
-console:x:21:
-utmp:x:22:
-public:x:32:
-video:x:33:
-games:x:40:
-xok:x:41:
-trusted:x:42:
-modem:x:43:
-ftp:x:49:
-man:x:62:
-users:x:100:
-nobody:x:65533:
-nogroup:x:65534:nobody
-messagebus:!:101:
-haldaemon:!:102:
diff --git a/src/lib/distro-info/scilin-5.5_x86_64/prereqfiles/etc/hosts b/src/lib/distro-info/scilin-5.5_x86_64/prereqfiles/etc/hosts
deleted file mode 100644
index 75721cd5..00000000
--- a/src/lib/distro-info/scilin-5.5_x86_64/prereqfiles/etc/hosts
+++ /dev/null
@@ -1 +0,0 @@
-127.0.0.1 localhost
diff --git a/src/lib/distro-info/scilin-5.5_x86_64/prereqfiles/etc/passwd b/src/lib/distro-info/scilin-5.5_x86_64/prereqfiles/etc/passwd
deleted file mode 100644
index 9b8fc4fe..00000000
--- a/src/lib/distro-info/scilin-5.5_x86_64/prereqfiles/etc/passwd
+++ /dev/null
@@ -1,14 +0,0 @@
-root:x:0:0:root:/root:/bin/bash
-bin:x:1:1:bin:/bin:/bin/bash
-daemon:x:2:2:Daemon:/sbin:/bin/bash
-lp:x:4:7:Printing daemon:/var/spool/lpd:/bin/bash
-mail:x:8:12:Mailer daemon:/var/spool/clientmqueue:/bin/false
-news:x:9:13:News system:/etc/news:/bin/bash
-uucp:x:10:14:Unix-to-Unix CoPy system:/etc/uucp:/bin/bash
-games:x:12:100:Games account:/var/games:/bin/bash
-man:x:13:62:Manual pages viewer:/var/cache/man:/bin/bash
-wwwrun:x:30:8:WWW daemon apache:/var/lib/wwwrun:/bin/false
-ftp:x:40:49:FTP account:/srv/ftp:/bin/bash
-nobody:x:65534:65533:nobody:/var/lib/nobody:/bin/bash
-messagebus:x:100:101:User for D-Bus:/var/run/dbus:/bin/false
-haldaemon:x:101:102:User for haldaemon:/var/run/hal:/bin/false
diff --git a/src/lib/distro-info/scilin-5.5_x86_64/prereqfiles/etc/shadow b/src/lib/distro-info/scilin-5.5_x86_64/prereqfiles/etc/shadow
deleted file mode 100644
index cd100a5a..00000000
--- a/src/lib/distro-info/scilin-5.5_x86_64/prereqfiles/etc/shadow
+++ /dev/null
@@ -1,14 +0,0 @@
-root::13481::::::
-bin:*:13481::::::
-daemon:*:13481::::::
-lp:*:13481::::::
-mail:*:13481::::::
-news:*:13481::::::
-uucp:*:13481::::::
-games:*:13481::::::
-man:*:13481::::::
-wwwrun:*:13481::::::
-ftp:*:13481::::::
-nobody:*:13481::::::
-messagebus:!:13481:0::7:::
-haldaemon:!:13481:0::7:::
diff --git a/src/lib/distro-info/scilin-5.5_x86_64/settings.default b/src/lib/distro-info/scilin-5.5_x86_64/settings.default
deleted file mode 100644
index 7c0f832b..00000000
--- a/src/lib/distro-info/scilin-5.5_x86_64/settings.default
+++ /dev/null
@@ -1,30 +0,0 @@
-bootstrap-packages = <<END
-    to-be-filled-in (List of base RPMs)
-END
-<metapackager yum>
-    packages = <<END
-        to-be-filled-in (List of RPMs for the YUM packager)
-    END
-</metapackager>
-package-subdir = ???
-prereq-packages = <<END
-    to-be-filled-in (List of needed RPMs)
-END
-<repository base>
-    name = Scientific Linux 5.5 64Bit
-    repo-subdir = ?
-    file-for-speedtest = ?
-</repository>
-<selection minimal>
-    packages = <<END
-        glibc-locale
-    END
-</selection>
-<selection kde>
-    base = minimal
-    packages = <<END
-    END
-</selection>
-<selection default>
-    base = minimal
-</selection>
diff --git a/src/lib/distro-info/scilin-5.5_x86_64/settings.example b/src/lib/distro-info/scilin-5.5_x86_64/settings.example
deleted file mode 100644
index 5ae02428..00000000
--- a/src/lib/distro-info/scilin-5.5_x86_64/settings.example
+++ /dev/null
@@ -1,17 +0,0 @@
-# rename this file to 'settings' and edit it as you please
-# 
-# for a list of all options, have a look at the corresponding 
-# settings.default in /opt/openslx/share/distro-info
-
-# use local installation source
-#<repository base>
-#    local-url = /srv/ftp/pub/some-distribution/inst-source
-#</repository>
-
-# add a new selection:
-#<selection my_number_crunsher>
-#    base = minimal
-#    packages = <<END
-#        crunsher_app
-#    END
-#</selection>
diff --git a/src/os-plugins/plugins/desktop/themes/common/scilin.png b/src/os-plugins/plugins/desktop/themes/common/scientific.png
index 1a22f2d5..1a22f2d5 100644
--- a/src/os-plugins/plugins/desktop/themes/common/scilin.png
+++ b/src/os-plugins/plugins/desktop/themes/common/scientific.png