summaryrefslogtreecommitdiffstats
path: root/initrd/initrd-stuff/bin/hwautocfg
diff options
context:
space:
mode:
authorDirk von Suchodoletz2006-05-21 16:26:00 +0200
committerDirk von Suchodoletz2006-05-21 16:26:00 +0200
commit8b0c4a5c2eec6204e70bdcdd82738ca1409248d7 (patch)
tree7955fa84e0696b27bbede58b07880c88948b09bb /initrd/initrd-stuff/bin/hwautocfg
parentsome fixes for automounter, better timing in init for nbd mounts ... (diff)
downloadcore-8b0c4a5c2eec6204e70bdcdd82738ca1409248d7.tar.gz
core-8b0c4a5c2eec6204e70bdcdd82738ca1409248d7.tar.xz
core-8b0c4a5c2eec6204e70bdcdd82738ca1409248d7.zip
better hw detection for devices on pcmcia, small fix for wrong error
message in servconfig. git-svn-id: http://svn.openslx.org/svn/openslx/ld4@228 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'initrd/initrd-stuff/bin/hwautocfg')
-rwxr-xr-xinitrd/initrd-stuff/bin/hwautocfg12
1 files changed, 6 insertions, 6 deletions
diff --git a/initrd/initrd-stuff/bin/hwautocfg b/initrd/initrd-stuff/bin/hwautocfg
index 11d22f21..459a4174 100755
--- a/initrd/initrd-stuff/bin/hwautocfg
+++ b/initrd/initrd-stuff/bin/hwautocfg
@@ -359,6 +359,12 @@ if [ -n "${PCMCIA}" ] ; then
#echo "pcmcia=\"yes\"" > config
modprobe ${MODPRV} ds
fi
+# 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
+test -f /proc/bus/usb/devices || mount -n -t usbfs usbfs /proc/bus/usb
+[ -n "$IDE" ] && modprobe -q ide_generic 2>/dev/null
+usleep 10 && hwsetup -v > /tmp/hwsetup.info
# remaining drivers listed in /tmp/hwsetup.info
cat /tmp/hwsetup.info| while read LINE ; do
if strinstr "driver:" "${LINE}"; then
@@ -371,12 +377,6 @@ cat /tmp/hwsetup.info| while read LINE ; do
fi
fi
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
-test -f /proc/bus/usb/devices || mount -n -t usbfs usbfs /proc/bus/usb
-[ -n "$IDE" ] && modprobe -q ide_generic 2>/dev/null
-usleep 10 && hwsetup -v > /tmp/hwsetup.info
# check if USB mouse and/or keyboard is connected and remove usbhid if
# not
strinfile "genericwheelusb" /tmp/hwsetup.info || \