More cleanup, small fix for hwautocfg ...

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

3 files changed, 10 insertions, 37 deletions

diff --git a/initramfs/distro-specs/debian/functions-default b/initramfs/distro-specs/debian/functions-default
index b5d93376..9dac0e9c 100644
--- a/initramfs/distro-specs/debian/functions-default
+++ b/initramfs/distro-specs/debian/functions-default
@@ -1,13 +1,14 @@
-# configuration script for general Debian to configure linux diskless clients
-# (executed within initialramfs after genconfig) 
+#!/bin/bash
+# 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 <dvs@OpenSLX.com>, 22-12-2006
-# Felix Endres, 30-04-2006
+# General information about OpenSLX can be found at http://openslx.org
 #
-# (c) 2006 - RZ Universitaet Freiburg
-# (c) 2006 - OpenSLX GmbH
+# Configuration script for general Debian to configure linux diskless clients
+# (executed within initialramfs after genconfig) 
 
 # empty functions are defined at the beginning of /etc/functions
 
@@ -28,22 +29,6 @@ config_distro () {
   sed -e "s/.*initdefault/id:${D_INITDEFAULT}:initdefault/" -i /mnt/etc/inittab
 }
 
-# udev/hotplug - auto device discovery service (deprecated, check and remove)
-# Result: 1 is bad, 0 is good
-udev_hotplug () {
-  local result=0
-  [ -d /etc/hotplug -a -d /etc/hotplug.d ] || error "$df_errhotpl" nonfatal
-  echo "Enabling hotplug/udev"
-  #udevstart && result=0
-  #udevtrigger && result=0
-  udevd --daemon || result=1
-  [ ! -e /sbin/udevsend ] && result=1
-  echo "/sbin/udevsend/" > /proc/sys/kernel/hotplug
-  mkdir -p /dev/.udev/db /dev/.udev/queue
-  trigger_device_events
-  return $result
-}
-
 # distro specific general function called from servconfig script
 config_distro () {
 # add the halt link to the 0 and 6 runlevel directories
diff --git a/initramfs/distro-specs/gentoo/functions-default b/initramfs/distro-specs/gentoo/functions-default
index 37a61791..9a87fad9 100644
--- a/initramfs/distro-specs/gentoo/functions-default
+++ b/initramfs/distro-specs/gentoo/functions-default
@@ -9,7 +9,7 @@
 #
 # General information about OpenSLX can be found under http://openslx.org
 #
-# configuration script for Gentoo linux distribution to configure OpenSLX
+# Configuration script for Gentoo linux distribution to configure OpenSLX
 # linux diskless clients (executed within initialramfs after genconfig) 
 
 # empty functions are defined at the beginning of /etc/functions
@@ -24,18 +24,6 @@ echo -e "# changes made to this file by $0 (initramfs from $date)" \
 config_rc_entry "KEYMAP" "${KEYTABLE}" "conf.d/keymaps"
 }
 
-# udev service (fixme: deprecated, check and remove!!)
-udev_hotplug () {
-ln -s /bin/udevd /bin/udevstart && udevstart &
-if [ -x /bin/udevd ] ; then
-  export UDEVD_EXPECTED_SEQNUM=$(cat /sys/kernel/hotplug_seqnum)
-  export UDEVD_EVENT_TIMEOUT=1
-  echo "" > /proc/sys/kernel/hotplug
-  udevd &
-else error "$df_errudev" nonfatal
-fi
-}
-
 # linking runlevel scripts and defining execution order
 rllinker () {
 local script="$1"
diff --git a/initramfs/initrd-stuff/bin/hwautocfg b/initramfs/initrd-stuff/bin/hwautocfg
index 1f0e3429..49f8d7b5 100755
--- a/initramfs/initrd-stuff/bin/hwautocfg
+++ b/initramfs/initrd-stuff/bin/hwautocfg
@@ -417,10 +417,10 @@ for hd in $(cat /tmp/hwsetup.info|sed -n -e '/HD$/,/device:/p'| \
     ( if diskfm $hdpartnr ; then
         echo "$hdpartnr is mounted to /mnt/tmp at $(sysup)" > /tmp/tmpready
         echo -e "$hdpartnr\t/tmp\t\tauto\t\tdefaults\t 0 0" >> /tmp/fstab
-        part44=yes
       else
         echo "formatting failed for some reason ($(sysup))" > /tmp/tmpready
       fi ) &
+    part44=yes
     break
   done
   # put detected linux partitions into /etc/fstab with "noauto"