From f6221172e7e515ef450a5fbad4c5f8f3583cfc28 Mon Sep 17 00:00:00 2001
From: Root
Date: Wed, 28 Feb 2007 16:59:31 +0000
Subject: Upstart related handling of inittab ...

git-svn-id: http://svn.openslx.org/svn/openslx/trunk@737 95ad53e4-c205-0410-b2fa-d234c58c8868
---
 initramfs/distro-specs/ubuntu/functions-6.10    | 31 ++++++++++++++++++-------
 initramfs/distro-specs/ubuntu/functions-default | 24 +++++++++----------
 2 files changed, 35 insertions(+), 20 deletions(-)

diff --git a/initramfs/distro-specs/ubuntu/functions-6.10 b/initramfs/distro-specs/ubuntu/functions-6.10
index 50abd87a..a9823410 100644
--- a/initramfs/distro-specs/ubuntu/functions-6.10
+++ b/initramfs/distro-specs/ubuntu/functions-6.10
@@ -1,14 +1,18 @@
-# configuration script for Ubuntu V6.06 to configure OpenSLX linux diskless
+# Copyright (c) 2003 - 2006 - RZ Uni Freiburg
+# Copyright (c) 2006, 2007 - OpenSLX GmbH
+#
+# This program/file is free software distributed under the GPL version 2.
+# See http://openslx.org/COPYING
+#
+# If you have any feedback please consult http://openslx.org/feedback and
+# send your feedback to feedback@openslx.org
+#
+# General information about OpenSLX can be found under http://openslx.org
+#
+# configuration script for Ubuntu 6.10 to configure OpenSLX linux diskless
 # clients (merged in stage2 with ubuntu/functions-default - and loaded within
 # initial ramfs - stage3) It may overwrite settings from the default config
 # file (/etc/functions)
-#
-# Dirk von Suchodoletz <dirk@goe.net>, 31-08-2006
-# Nico Dietrich
-# Felix Endres, 29-08-2006
-#
-# (c) 2006 - RZ Universitaet Freiburg
-# (c) 2006 - OpenSLX.ORG Project
 
 # distro specific stuff to initialize
 preinit () {
@@ -20,6 +24,17 @@ preinit () {
 }
 
 # distro specific function called from servconfig script
+config_distro () {
+# add the halt link to the 0 and 6 runlevel directories
+  ln -sf ../init.d/halt /mnt/etc/rc0.d/S90halt
+  ln -sf ../init.d/reboot /mnt/etc/rc6.d/S90reboot
+  # 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 ...)
+  /mnt/bin/mknod /dev/zero c 1 5
+  /mnt/bin/mknod /dev/mem c 1 1
+}
 
 # udev/hotplug - auto device discovery service
 # fixme: why does nothing happens here!? If default should be used just
diff --git a/initramfs/distro-specs/ubuntu/functions-default b/initramfs/distro-specs/ubuntu/functions-default
index 4badbcf7..07c20101 100644
--- a/initramfs/distro-specs/ubuntu/functions-default
+++ b/initramfs/distro-specs/ubuntu/functions-default
@@ -1,15 +1,16 @@
-# configuration script for general Ubuntu to configure OpenSLX linux
-# diskless clients (executed within initial ramdisk after genconfig) 
+# 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
 #
-# 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
-# mj0, 12-12-2006
+# General information about OpenSLX can be found under http://openslx.org
 #
-# (c) 2006 - RZ Universitaet Freiburg
-# (c) 2006 - OpenSLX GmbH
+# configuration script for general Ubuntu to configure OpenSLX linux
+# diskless clients (executed within initial ramdisk after genconfig) 
 
 # empty functions are defined at the beginning of /etc/functions
 
@@ -52,13 +53,12 @@ config_distro () {
 # add the halt link to the 0 and 6 runlevel directories
   ln -sf ../init.d/halt /mnt/etc/rc0.d/S90halt
   ln -sf ../init.d/reboot /mnt/etc/rc6.d/S90reboot
-  
   # set default runlevel
   sed -e "s/.*initdefault/id:${D_INITDEFAULT}:initdefault/" -i /mnt/etc/inittab
-  # needed lateron (by hwsetup?)
+  # 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
-- 
cgit v1.2.3-55-g7522