Cleanups for InitRamFS: busybox is made the main tool ...

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

5 files changed, 17 insertions, 27 deletions

diff --git a/initramfs/distro-specs/suse/functions-10.2 b/initramfs/distro-specs/suse/functions-10.2
index bce6b939..c24ad571 100644
--- a/initramfs/distro-specs/suse/functions-10.2
+++ b/initramfs/distro-specs/suse/functions-10.2
@@ -57,10 +57,6 @@ config_kdm_template
 udev_hotplug () {
 local result=0
 echo "Starting udev"
-# might be used if busybox is available
-#mknod /dev/console c 5 1
-#mknod /dev/null c 1 3
-#mknod /dev/kmsg c 1 11
 if [ -x /bin/udevd ] ; then
   echo "" > /proc/sys/kernel/hotplug
   udevd --daemon 2>/dev/null || result=1
diff --git a/initramfs/distro-specs/suse/functions-default b/initramfs/distro-specs/suse/functions-default
index 37bc5539..b7e1a1c0 100644
--- a/initramfs/distro-specs/suse/functions-default
+++ b/initramfs/distro-specs/suse/functions-default
@@ -9,8 +9,8 @@
 #
 # General information about OpenSLX can be found under http://openslx.org
 #
-# configuration script for general SuSE to configure linux diskless clients 
-# (included by init, hwautocfg, servconfig within initial ramdisk after 
+# configuration script for general SuSE to configure linux stateless clients 
+# (included by init, hwautocfg, servconfig within InitialRamFS after 
 # inclusion of the main functions file). This file is the main base for the
 # several SuSE distro versions
 
diff --git a/initramfs/distro-specs/ubuntu/functions-6.06 b/initramfs/distro-specs/ubuntu/functions-6.06
index a2f54be5..4296be26 100644
--- a/initramfs/distro-specs/ubuntu/functions-6.06
+++ b/initramfs/distro-specs/ubuntu/functions-6.06
@@ -1,16 +1,18 @@
-# configuration script for Ubuntu V6.06 to configure OpenSLX linux diskless
-# clients (merged in stage2 with ubuntu/functions-default - and loaded within
-# initial ramfs - stage3) It may overwrite settings from the default config
-# file (/etc/functions)
+# Copyright (c) 2003 - 2006 - RZ Uni Freiburg
+# Copyright (c) 2006, 2007 - OpenSLX GmbH
+#
+# This program is free software distributed under the GPL version 2.
+# See http://openslx.org/COPYING
 #
-# this file is distributed under the GPLv2, see ~/openslx/COPYING
+# If you have any feedback please consult http://openslx.org/feedback and
+# send your feedback to feedback@openslx.org
 #
-# Dirk von Suchodoletz <dirk@goe.net>, 22-12-2006
-# Nico Dietrich
-# Felix Endres, 29-08-2006
+# General information about OpenSLX can be found at http://openslx.org
 #
-# (c) 2006 - RZ Universitaet Freiburg
-# (c) 2006 - OpenSLX GmbH
+# Configuration script for Ubuntu V6.06 to configure OpenSLX linux stateless
+# clients (merged in stage2 with ubuntu/functions-default - and loaded within
+# initial ramfs - stage3). It may overwrite settings from the default config
+# file (/etc/functions)
 
 # distro specific stuff to initialize
 preinit () {
diff --git a/initramfs/distro-specs/ubuntu/functions-6.10 b/initramfs/distro-specs/ubuntu/functions-6.10
index c72878bf..7f8ed4b9 100644
--- a/initramfs/distro-specs/ubuntu/functions-6.10
+++ b/initramfs/distro-specs/ubuntu/functions-6.10
@@ -9,7 +9,7 @@
 #
 # General information about OpenSLX can be found under http://openslx.org
 #
-# configuration script for Ubuntu 6.10 to configure OpenSLX linux diskless
+# Configuration script for Ubuntu 6.10 to configure OpenSLX linux stateless
 # clients (merged in stage2 with ubuntu/functions-default - and loaded within
 # initial ramfs - stage3) It may overwrite settings from the default config
 # file (/etc/functions)
@@ -31,10 +31,6 @@ config_distro () {
   sed -i '/halt.*-i/s/ -i / /' /mnt/etc/init.d/halt  
   # set default runlevel
   # how that is done for upstart??
-  # needed lateron (by hwsetup? - fixme, check if already copied by
-  # mkdxsinitrd!! If busybox is installed use tool directly ...)
-  [ -e /dev/zero ] || /mnt/bin/mknod /dev/zero c 1 5
-  [ -e /dev/mem ] || /mnt/bin/mknod /dev/mem c 1 1
 }
 
 # udev/hotplug - auto device discovery service
diff --git a/initramfs/distro-specs/ubuntu/functions-default b/initramfs/distro-specs/ubuntu/functions-default
index 2d0da092..c7a01fed 100644
--- a/initramfs/distro-specs/ubuntu/functions-default
+++ b/initramfs/distro-specs/ubuntu/functions-default
@@ -9,8 +9,8 @@
 #
 # General information about OpenSLX can be found under http://openslx.org
 #
-# configuration script for general Ubuntu to configure OpenSLX linux
-# diskless clients (executed within initial ramdisk after genconfig) 
+# Configuration script for general Ubuntu to configure OpenSLX linux
+# stateless clients (executed within initial ramdisk after genconfig) 
 
 # empty functions are defined at the beginning of /etc/functions
 
@@ -55,10 +55,6 @@ config_distro () {
   ln -sf ../init.d/reboot /mnt/etc/rc6.d/S90reboot
   # set default runlevel
   sed -e "s/.*initdefault/id:${D_INITDEFAULT}:initdefault/" -i /mnt/etc/inittab
-  # needed lateron (by hwsetup? - fixme, check if already copied by
-  # mkdxsinitrd!! If busybox is installed use tool directly ...)
-  /mnt/bin/mknod /dev/zero c 1 5
-  /mnt/bin/mknod /dev/mem c 1 1
 }
 
 # AUS SuSE-9.3