X-Git-Url: http://git.grml.org/?p=grml-autoconfig.git;a=blobdiff_plain;f=autoconfig;h=df1595722083da6a5a583e37ea23e9afcc4ebaa4;hp=807d16b843d043327b014c01c9087132fb0c6ca0;hb=9af1e4e4607e9c516ecbe874e6688f13e6d3f93b;hpb=0153caf45849999ec45b462cd20ea32ca543fdde

diff --git a/autoconfig b/autoconfig
index 807d16b..df15957 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
@@ -68,16 +67,12 @@ CONFIG_DMRAID='yes'           # support for dmraid
 CONFIG_EXTRACT='yes'          # specify which (only in combination with bootparam myconfig/netconfig useful)
 CONFIG_FAST='yes'             # skip startup of w3m on tty1
 CONFIG_FINDDCSDIR='yes'       # search for a debs, config, scripts directory
-CONFIG_FIREWIRE_DEV='no'      # bugfix for kernel >=2.6.11 - create some firewire-devices
 CONFIG_FIX_PASSWD='yes'       # fix unionfs-problem with passwd
 CONFIG_FIX_UNIONFS='yes'      # fix/workaround for unionfs
 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
@@ -97,7 +92,6 @@ CONFIG_NETSCRIPT='yes'        # download and run script/executable provided by b
 CONFIG_NETIPV6='yes'          # check for bootparam ipv6
 CONFIG_PARTCONF='yes'         # do we want partconf to work?
 CONFIG_PASSWD='yes'           # set password via bootparam passwd
-CONFIG_PCMCIA='no'            # check for pcmcia and start cardmgr
 CONFIG_SCRIPTS='yes'          # execute scripts from the scripts option
 CONFIG_SERVICES='yes'         # check for services to run, provided via bootparam
 CONFIG_SMALL='yes'            # use a less "bloat" /etc/inittab for small computer with less RAM