Drop deprecated config_hwinfo().

We don't need hwinfo in boot stage since ages and
udev is known to provide what we need. Get rid
of this inactive and outdated code therefore.

diff --git a/autoconfig b/autoconfig
index df15957..11c8bc5 100644 (file)
--- a/autoconfig
+++ b/autoconfig
@@ -73,7 +73,6 @@ CONFIG_FWTIMEOUT='yes'        # set timeout for firmware loading
 CONFIG_GRML2HD='yes'          # check for 'grml2hd' bootoption
 CONFIG_HOMEDIR='yes'          # check for persistent homedir option
 CONFIG_HOSTNAME='yes'         # set hostname to 'grml' on systems running from CD
-CONFIG_HWINFO='no'            # run hwinfo for module-detection (requires bootparam 'hwinfo'!)
 CONFIG_HWSPEAK='yes'          # support for hardware synthesizer via speakup
 CONFIG_KERNEL='yes'           # display information on running kernel
 CONFIG_LANGUAGE='yes'         # allow language specification via commandline

diff --git a/autoconfig.functions b/autoconfig.functions
index e69ab0d..a8eed74 100755 (executable)
--- a/autoconfig.functions
+++ b/autoconfig.functions
@@ -667,18 +667,6 @@ fi
 }
 # }}}
 
-# {{{ hardware detection via hwinfo
-config_hwinfo(){
-if checkbootparam 'hwinfo' >>$DEBUG 2>&1; then
-  einfo "Discovering hardware via hwinfo:"
-  MODULES=$(su grml hwinfo | grep "Cmd: \"modprobe" | awk '{print $5}' | sed 's/"//')
-  echo -n "  Loading modules: "
-  for i in `echo $MODULES` ; do echo -n $i && modprobe $i ; done
-  eend 0
-fi
-}
-# }}}
-
 # {{{ blacklist specific module [ used in /etc/init.d/udev ]
 config_blacklist(){
 if checkbootparam 'blacklist' ; then

diff --git a/grml-autoconfig b/grml-autoconfig
index e5abca7..79af3db 100755 (executable)
--- a/grml-autoconfig
+++ b/grml-autoconfig
@@ -142,12 +142,10 @@ checkvalue $CONFIG_TESTCD && config_testcd
 
 [ -n "$SPLASH" ] && /usr/bin/grml-bootsplash "||||">/dev/tty14
 
-checkvalue $CONFIG_HWINFO && config_hwinfo
+checkvalue $CONFIG_MODULES && config_modules
 
 [ -n "$SPLASH" ] && /usr/bin/grml-bootsplash "|||||">/dev/tty14
 
-checkvalue $CONFIG_MODULES && config_modules
-
 checkvalue $CONFIG_ACPI_APM && config_acpi_apm
 
 [ -n "$SPLASH" ] &&  /usr/bin/grml-bootsplash "||||||">/dev/tty14