From 8b0c4a5c2eec6204e70bdcdd82738ca1409248d7 Mon Sep 17 00:00:00 2001
From: Dirk von Suchodoletz
Date: Sun, 21 May 2006 14:26:00 +0000
Subject: 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
---
 initrd/initrd-stuff/bin/hwautocfg  | 12 ++++++------
 initrd/initrd-stuff/bin/servconfig |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'initrd/initrd-stuff/bin')

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" \
-- 
cgit v1.2.3-55-g7522