Reverting patch that was originally added due to bug #160333 due to the problems...

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/genkernel/trunk@509 67a159dc-881f-0410-a524-ba9dfbe2cb84

diff --git a/ChangeLog b/ChangeLog
index a6add91d72af776ad2f86864b2703f8a39493f37..9df17df1c6ea574f88005017500bd7cd7efe37cc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 2006-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  21 Jun 2007; Chris Gianelloni <wolf31o2@gentoo.org>
+  generic/initrd.scripts:
+  Reverting patch that was originally added due to bug #160333 due to the
+  problems it caused on the 2007.0 release.
+
   12 Apr 2007; Chris Gianelloni <wolf31o2@gentoo.org> gen_package.sh,
   genkernel:
   Added a patch from Andrew Gaffney <agaffney@gentoo.org> to add System.map to

diff --git a/generic/initrd.scripts b/generic/initrd.scripts
index b5c040d914275c5549c67ec512ceb1112ea29dac..352ddd722233fdb04f033ab0e5d0ffc36df8fed6 100644 (file)
--- a/generic/initrd.scripts
+++ b/generic/initrd.scripts
@@ -323,26 +323,14 @@ start_dev_mgr() {
 
        if [ "${USE_UDEV_NORMAL}" -eq '1' ]
        then
-               for dir in /sys/bus/usb/drivers/usb-storage/*
-               do
-                       if [ -d "${dir}" ]
-                       then
-                               FORCE_slowusb="1"
-                       fi
-               done
-               if [ "${DO_slowusb}" ] || [ "${FORCE_slowusb}" ]
-               then
-                       sleep 10
-               fi
-
+               cd /sys
+               [ "${DO_slowusb}" ] && sleep 10
                kill_devfsd
                good_msg 'Activating mdev'
+#              runUdev
                runmdev
-
-               if [ "${DO_slowusb}" ] || [ "${FORCE_slowusb}" ]
-               then
-                       sleep 10
-               fi
+               [ "${DO_slowusb}" ] && sleep 20
+               cd /
        else
                good_msg 'Activating devfs'
                mount -t devfs devfs /dev 2>/dev/null