From 336d22f0089eaa50467bdae2f8d63c2294fabcba Mon Sep 17 00:00:00 2001
From: Michael Prokop <mika@grml.org>
Date: Thu, 7 Jul 2011 00:24:21 +0200
Subject: [PATCH] Drop deprecated config_discover().

udev is known to work quite reliable and detects all relevant
hardware drivers, let's get rid of old and unused discover.
---
 autoconfig           |  1 -
 autoconfig.functions | 19 -------------------
 grml-autoconfig      |  2 --
 3 files changed, 22 deletions(-)

diff --git a/autoconfig b/autoconfig
index 807d16b..5e76359 100644
--- a/autoconfig
+++ b/autoconfig
@@ -60,7 +60,6 @@ CONFIG_DEBOOTSTRAP='yes'      # support automatic installation of Debian via grm
 CONFIG_DEBNET='yes'           # search for /etc/network/interfaces on partitions and set up network afterwards
 CONFIG_DEBS='yes'             # check for bootoption debs for installing .debs
 CONFIG_DEBUG='yes'            # activate start of shells during startup at several stages
-CONFIG_DISCOVER='no'          # use discover for hardware detection
 CONFIG_DISTCC='yes'           # activate and setup distcc through bootparam distcc=$NETWORK,$INTERFACE
 CONFIG_DISTRI='yes'           # support some customization via bootoption distri
 CONFIG_DMA='yes'              # Enable DMA for all IDE drives
diff --git a/autoconfig.functions b/autoconfig.functions
index e813921..ab7062d 100755
--- a/autoconfig.functions
+++ b/autoconfig.functions
@@ -689,25 +689,6 @@ fi
 }
 # }}}
 
-# {{{ hardware detection via discover
-config_discover(){
-if checkbootparam 'nodisc' ; then
-  ewarn "Skipping hardware detection via discover as requested on boot commandline." ; eend 0
-else
- if [ -x /sbin/discover ] ; then
-  einfo "Discovering hardware. Trying to load the following modules in background:"
-   eindent
-   einfo "$(discover --data-path=linux/module/name --data-path=linux/modules/options --format="%s %s" --data-version=`uname -r` --enable-bus all | sort -u | xargs echo)"
-   eoutdent
-  /sbin/discover-modprobe -v >>$DEBUG 2>&1 &
-  eend 0
- else
-  eerror "Application discover not available. Information: udev should handle hardware recognition." ; eend 0
- fi
-fi
-}
-# }}}
-
 # {{{ hardware detection via hwinfo
 config_hwinfo(){
 if checkbootparam 'hwinfo' >>$DEBUG 2>&1; then
diff --git a/grml-autoconfig b/grml-autoconfig
index 0fb2806..f67457f 100755
--- a/grml-autoconfig
+++ b/grml-autoconfig
@@ -144,8 +144,6 @@ checkvalue $CONFIG_TESTCD && config_testcd
 
 [ -n "$SPLASH" ] && /usr/bin/grml-bootsplash "||||">/dev/tty14
 
-checkvalue $CONFIG_DISCOVER && config_discover
-
 checkvalue $CONFIG_HWINFO && config_hwinfo
 
 checkvalue $CONFIG_HOTPLUG_AGENT && config_hotplug_agent
-- 
2.1.4