Restructured hwautocfg (moved hw related parts of init into it) -

should fix hangs on certain hardware (not fully tested yet) ...


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

1 files changed, 8 insertions, 13 deletions

diff --git a/initramfs/initrd-stuff/init b/initramfs/initrd-stuff/init
index 663085c1..65ee9687 100755
--- a/initramfs/initrd-stuff/init
+++ b/initramfs/initrd-stuff/init
@@ -76,12 +76,12 @@ nfsro="nfs"
 
 # load usb modules for keyboard (reenable usb keyboards, otherwise the
 # admin has to wait until second run of hwsetup late in stage3)
-echo "0 0 0 0" >/proc/sys/kernel/printk
-( for mod in usbcore uhci-hcd ohci-hcd usbhid; do
-  modprobe -q $mod 2>/dev/null
-  usleep 5
-done; echo "1 4 1 7" >/proc/sys/kernel/printk ) &
-
+#echo "0 0 0 0" >/proc/sys/kernel/printk
+#( for mod in usbcore uhci-hcd ohci-hcd usbhid; do
+#  modprobe -q $mod 2>/dev/null
+#  usleep 5
+#done; echo "1 4 1 7" >/proc/sys/kernel/printk ) &
+hwautocfg pre
 
 # run pre init script and user defined preinit.local, copied by mkdxsinitrd
 # from /var/lib/openslx/config/... in stage2
@@ -283,12 +283,7 @@ else
   [ "${DEBUGLEVEL}" != 8 ] && exec < /dev/console > /dev/null 2>&1
 fi
 # load network adaptor modules
-[ $DEBUGLEVEL -eq 20 ] && \
-  echo "** loading all defined network adaptor modules at $(sysup)"
-for mod in ${NWMODULES}; do
-  modprobe ${MODPRV} $mod || error "$init_errnwad"
-  usleep 5
-done
+hwautocfg nwmod
 
 # set up loopback networking (ipsetup - function defined in /etc/functions)
 [ $DEBUGLEVEL -eq 20 ] && echo "** starting ip config at $(sysup)"
@@ -457,7 +452,7 @@ if [ ${DEBUGLEVEL} = 21 ] ; then
 else
   [ $DEBUGLEVEL -eq 20 ] && echo "** started hwautocfg in background at \
 $(sysup)"
-  hwautocfg &
+  hwautocfg main &
 fi
 
 # try to use unionfs for rw access if available