Hardware-Erkennung erweitert (erste Basics für CD und HD, Quickhack für

USB-Maus). Kleinere Fixes in Timings der Parallelisierung ...



git-svn-id: http://svn.openslx.org/svn/openslx/dxs/ld4@19 95ad53e4-c205-0410-b2fa-d234c58c8868

1 files changed, 13 insertions, 4 deletions

diff --git a/initrd/initrd-stuff/init b/initrd/initrd-stuff/init
index 0b7b6a11..a392f173 100755
--- a/initrd/initrd-stuff/init
+++ b/initrd/initrd-stuff/init
@@ -26,8 +26,12 @@ echo 256 > /proc/sys/kernel/real-root-dev
 
 # start device auto discovery (just the first case is tested yet)
 if [ -x /bin/udev -a -x /bin/udevstart ] ; then
-  echo "Starting udev"
-  echo "/bin/udev" > /proc/sys/kernel/hotplug
+#  if [ -x /bin/hotplug.sh ]; then
+#    echo "/bin/hotplug.sh" > /proc/sys/kernel/hotplug
+#    testmkd /events
+#  else
+    echo "/bin/udev" > /proc/sys/kernel/hotplug
+#  fi
   /bin/udevstart &
 elif [ -x /bin/hotplug ] ; then
   echo "Enabling hotplug"
@@ -284,6 +288,8 @@ else
   rm -rf /root/* >/dev/null 2>&1
   # run some specific stuff !?
 fi
+# script for stuff to execute during early bootup
+echo -e "#!/bin/sh\n# skeleton written from $0" >/mnt/etc/${INITDIR}/boot.ld
 echo "fs complete" >/tmp/fscmpl
 
 # write debug file information after filesystem setup completed
@@ -332,9 +338,11 @@ cp /etc/machine-setup /mnt/etc
 waitfor /tmp/hwcfg 20000 || error "  For some reason the hardware autoconfig \
 of this client did not finish in\n  time. You might check the process list \
 and list the modules loaded until\n  now."
-
+waitfor /tmp/svcfg 20000 || error "  For some reason the software config \
+of this client did not finish in\n  time. You might check the process list \
+and list the modules loaded until\n  now."
 date
-ash
+#ash
 # IP configuration is made and should not be updated automatically
 killall -9 dhcpcd dhclient pump 2>/dev/null
 # unmount the bind mounted modules directory
@@ -348,6 +356,7 @@ is no regular one. It is needed\n  for the bootup procedure to follow."
 umount -n /sys || error "  Unmount of the kernel sys directory \
 failed for some\nreason.  You will get some error messages that some files \
 could not be\n  removed." nonfatal
+umount -n /proc/bus/usb >/dev/null 2>&1
 mount -n --move /dev /mnt/dev
 cd /mnt
 umount -n /proc