From 420ca89d7d39bdbf94d90480e2f9bc840e3e0c92 Mon Sep 17 00:00:00 2001
From: Dirk von Suchodoletz
Date: Mon, 30 Jan 2006 01:24:35 +0000
Subject: Improved timings for hardware configuration. On slower machines
 module loading takes some time (more) ...

git-svn-id: http://svn.openslx.org/svn/openslx/dxs/ld4@49 95ad53e4-c205-0410-b2fa-d234c58c8868
---
 initrd/initrd-stuff/bin/hwautocfg | 5 ++---
 initrd/initrd-stuff/init          | 6 ++++--
 2 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'initrd')

diff --git a/initrd/initrd-stuff/bin/hwautocfg b/initrd/initrd-stuff/bin/hwautocfg
index 4618eeea..87dca497 100755
--- a/initrd/initrd-stuff/bin/hwautocfg
+++ b/initrd/initrd-stuff/bin/hwautocfg
@@ -361,8 +361,7 @@ done
 # rerun the knoppix hardware autodetection tool for USB and ide devices
 # like dvd or harddisk - wait a few seconds so hopefully the ide driver
 # is initialized 
-( usleep 20 &&  
-hwsetup -v > /tmp/hwsetup.info
+( usleep 20 && hwsetup -v > /tmp/hwsetup.info
 # check if USB mouse and/or keyboard is connected
 strinfile "genericwheelusb" /tmp/hwsetup.info && modprobe ${MODPRV} usbhid
 # fixme - usb keyboard??
@@ -370,7 +369,7 @@ if strinfile "IDE" /tmp/hwsetup.info ; then
   strinfile "CDROM" /tmp/hwsetup.info && modprobe ${MODPRV} ide_cd
   strinfile "HD" /tmp/hwsetup.info && modprobe ${MODPRV} ide_disk &
   usleep 5
-fi ) &
+fi )
 # cdrom/dvd und plattenkonfig. ergaenzen. Module sind hier geladen und
 # devices sind klar
 
diff --git a/initrd/initrd-stuff/init b/initrd/initrd-stuff/init
index 985253b7..94cb78ec 100755
--- a/initrd/initrd-stuff/init
+++ b/initrd/initrd-stuff/init
@@ -387,8 +387,10 @@ and list the modules loaded until\n  now."
 # should be killed if started within init
 killall -9 dhcpcd dhclient pump udevd 2>/dev/null
 # unmount the bind mounted modules directory
-umount -n /lib/modules/${KERNEL} || error "Unmount of the kernel \
-modules directory failed for some reason."
+umount -n /lib/modules/${KERNEL} || {
+  usleep 40 && umount -n /lib/modules/${KERNEL} || \
+  error "Unmount of the kernel modules directory failed for some reason."
+}
 # close runlevel script for stuff to execute during early bootup
 d_mkbootld close
 # check for inittab file
-- 
cgit v1.2.3-55-g7522