diff options
| author | Dirk von Suchodoletz | 2006-05-21 16:26:00 +0200 |
|---|---|---|
| committer | Dirk von Suchodoletz | 2006-05-21 16:26:00 +0200 |
| commit | 8b0c4a5c2eec6204e70bdcdd82738ca1409248d7 (patch) | |
| tree | 7955fa84e0696b27bbede58b07880c88948b09bb /initrd/initrd-stuff | |
| parent | some fixes for automounter, better timing in init for nbd mounts ... (diff) | |
| download | core-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')
| -rwxr-xr-x | initrd/initrd-stuff/bin/hwautocfg | 12 | ||||
| -rwxr-xr-x | initrd/initrd-stuff/bin/servconfig | 2 |
2 files changed, 7 insertions, 7 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 || \ diff --git a/initrd/initrd-stuff/bin/servconfig b/initrd/initrd-stuff/bin/servconfig index 28dede13..ab29f861 100755 --- a/initrd/initrd-stuff/bin/servconfig +++ b/initrd/initrd-stuff/bin/servconfig @@ -210,7 +210,7 @@ if [ -n "${automnt_src}" ] ; then automnt_dir=${automnt_dir#/} automnt_dir=${automnt_dir%/} test -d /${automnt_dir} || error "$scfg_erradir" nonfatal - strinstr "/" ${automnt_dir} || error "$scfg_erratpld" nonfatal + strinstr "/" ${automnt_dir} && error "$scfg_erratpld" nonfatal echo -e "/${automnt_dir}\t/etc/auto.${automnt_dir}\n" \ >> /mnt/etc/auto.master echo -e "# /etc/auto.${automnt_dir} created by $0:\n" \ |