Bugfix for init/hwautocfg (waitfor), minor cleanups ...

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

1 files changed, 7 insertions, 7 deletions

diff --git a/initramfs/initrd-stuff/bin/hwautocfg b/initramfs/initrd-stuff/bin/hwautocfg
index bfbbe59f..177dd866 100755
--- a/initramfs/initrd-stuff/bin/hwautocfg
+++ b/initramfs/initrd-stuff/bin/hwautocfg
@@ -307,12 +307,6 @@ for driver in ehci-hcd ohci1394; do
     driverlist="${driverlist} ${driver}"; }
 done
 [ -x /bin/mdev ] && mdev -s &
-# remove unneeded network card and USB 1.1 modules
-for driver in ${NWMODULES} ohci-hcd uhci-hcd ; do
-  strinfile " ${driver}" /tmp/hwsetup.info || {
-    rmmod ${driver} &
-    driverlist="${driverlist} ${driver}"; }
-done
 # check for pcmcia / cardbus stuff
 for driver in yenta_socket i82365 pd6729 tcic; do
   strinfile " ${driver}" /tmp/hwsetup.info && {
@@ -335,7 +329,13 @@ fi
 test -f /proc/bus/usb/devices || \
   mount -n -t usbfs usbfs /proc/bus/usb 2>/dev/null
 [ $DEBUGLEVEL -eq 21 ] && echo "** started 2nd hwdetection at $(sysup)"
-hwsetup -v > /tmp/hwsetup.info
+# remove unneeded network card and USB 1.1 modules
+for driver in ${NWMODULES} ohci-hcd uhci-hcd ; do
+  strinfile " ${driver}" /tmp/hwsetup.info || {
+    rmmod ${driver}
+    driverlist="${driverlist} ${driver}"; }
+done
+usleep 100 && hwsetup -v > /tmp/hwsetup.info
 [ $DEBUGLEVEL -eq 21 ] && echo "** finished 2nd hwdetection at $(sysup)"
 
 # load IDE high level drivers