X-Git-Url: http://git.grml.org/?p=grml-autoconfig.git;a=blobdiff_plain;f=autoconfig;h=6ad9b4698262084b5e756698edb4c2c191e8a43a;hp=4fe6b3b3e105590a5b284e5cea6a7e8305996561;hb=1e324617322aded66e1526df80ba225b7403d3dd;hpb=8ae37ab733a40aa3d76400cee6f836305ca7ccec

diff --git a/autoconfig b/autoconfig
index 4fe6b3b..6ad9b46 100644
--- a/autoconfig
+++ b/autoconfig
@@ -25,12 +25,6 @@
 # set console font, default: Lat15-Terminus16
 # CONSOLEFONT='iso15graf-16'
 
-# check for network devices and run pump for every present network device?
-# use script grml-network for interactive configuration and
-# /etc/network/interfaces for persistent configuration
-# default: yes
-CONFIG_DHCP='yes'
-
 # check for frequency-scalable CPU and activate cpydyn/powernowd (default: yes)
 CONFIG_CPU='yes'
 
@@ -106,7 +100,6 @@ 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_QEMU='yes'             # qemu specific stuff
 CONFIG_SCRIPTS='yes'          # execute scripts from the scripts option
 CONFIG_SERVICES='yes'         # check for services to run, provided via bootparam
 CONFIG_SETKEYCODES='yes'      # run setkeycodes when bootoption setkeycodes found
@@ -119,7 +112,6 @@ CONFIG_TIME='yes'             # set clock, check for bootparam utc/gmt [only in
 CONFIG_TIMEZONE='yes'         # get bootparam 'tz' and set it as /etc/localtime [only in live-mode]
 CONFIG_TOHD='yes'             # bootoption tohd=...
 CONFIG_USERFSTAB='yes'        # check for username of uid 1000
-CONFIG_VMWARE='yes'           # vmware specific stuff (use xorg.conf.vmware)
 CONFIG_VNC='yes'              # check for bootparam vnc
 CONFIG_WELCOME='yes'          # play welcome sound (audio)
 CONFIG_WONDERSHAPER='yes'     # start wondershaper with options provided via bootparam