From b15ea38b6cb805e68c406b0ea4ac498c6d96e212 Mon Sep 17 00:00:00 2001
From: Michael Prokop <mika@grml.org>
Date: Thu, 7 Jul 2011 00:33:22 +0200
Subject: [PATCH] Drop deprecated config_hotplug_agent(),
 config_hotplug_blacklist() and config_hotplug().

All those hotplug functions are deprecated and unsupported
since ages, let's get rid of it.
---
 autoconfig           |  3 ---
 autoconfig.functions | 49 -------------------------------------------------
 grml-autoconfig      |  6 ------
 3 files changed, 58 deletions(-)

diff --git a/autoconfig b/autoconfig
index be5baa8..e8ef68e 100644
--- a/autoconfig
+++ b/autoconfig
@@ -73,9 +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_HOTPLUG_AGENT='no'     # deactivate specific hotplug agent(s) via bootparam
-CONFIG_HOTPLUG_BLACKLIST='no' # check for blacklist bootparam
-CONFIG_HOTPLUG_MAIN='no'      # start hotplug system [should be handled by udev now]
 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
diff --git a/autoconfig.functions b/autoconfig.functions
index bf447f6..84fd976 100755
--- a/autoconfig.functions
+++ b/autoconfig.functions
@@ -679,55 +679,6 @@ fi
 }
 # }}}
 
-# {{{ disable hotplug agents on request
-config_hotplug_agent(){
-if checkbootparam 'noagent' ; then
-  AGENT="$(getbootparam 'noagent' 2>>$DEBUG)"
-  AGENTLIST=$(echo "$AGENT" | sed 's/,/\\n/g')
-  AGENTNL=$(echo "$AGENT" | sed 's/,/ /g')
-  einfo "Disabling hotplug-agent(s) $AGENTNL"
-  for agent in $(echo -e $AGENTLIST) ; do
-    mv /etc/hotplug/${agent}.rc /etc/hotplug/${agent}.norc
-  done
-  [ "$?" == "0" ] ; eend $?
-fi
-}
-# }}}
-
-# {{{ blacklist of hotplug-modules
-config_hotplug_blacklist(){
-if checkbootparam 'black' ; then
-  BLACK="$(getbootparam 'black' 2>>$DEBUG)"
-  BLACKLIST=$(echo "$BLACK" | sed 's/,/\\n/g')
-  BLACKNL=$(echo "$BLACK" | sed 's/,/ /g')
-  einfo "Blacklisting $BLACKNL via /etc/hotplug/blacklist.d/hotplug-light"
-  echo -e "$BLACKLIST" >> /etc/hotplug/blacklist.d/hotplug-light
-  echo -e "$BLACKLIST" >> /etc/hotplug/blacklist
-  eend 0
-fi
-}
-# }}}
-
-# {{{ run hotplug
-config_hotplug(){
-if checkbootparam 'nohotplug' ; then
-  ewarn "Skipping running hotplug as requested on boot commandline." ; eend 0
-else
-  if [ -r /etc/init.d/hotplug ] ; then
-    einfo "Starting hotplug system in background."
-    /etc/init.d/hotplug start >>$DEBUG 2>>$DEBUG &
-    eend 0
-  elif [ -r /etc/init.d/hotplug-light ] ; then
-    einfo "Starting hotplug-light system in background."
-    /etc/init.d/hotplug-light start >>$DEBUG 2>>$DEBUG &
-    eend 0
-  else
-    ewarn "No hotplug system found. Should be handled by udev. Skipping execution." ; eend 0
-  fi
-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 2f214c2..1218043 100755
--- a/grml-autoconfig
+++ b/grml-autoconfig
@@ -144,12 +144,6 @@ checkvalue $CONFIG_TESTCD && config_testcd
 
 checkvalue $CONFIG_HWINFO && config_hwinfo
 
-checkvalue $CONFIG_HOTPLUG_AGENT && config_hotplug_agent
-
-checkvalue $CONFIG_HOTPLUG_BLACKLIST && config_hotplug_blacklist
-
-checkvalue $CONFIG_HOTPLUG_MAIN && config_hotplug
-
 checkvalue $CONFIG_MODULES && config_modules
 
 checkvalue $CONFIG_ACPI_APM && config_acpi_apm
-- 
2.1.4