Actually use $TIMEOUT for fw timeout

[grml-autoconfig.git] / autoconfig

diff --git a/autoconfig b/autoconfig
index 45da179..29a6d67 100644 (file)
--- a/autoconfig
+++ b/autoconfig
@@ -35,8 +35,8 @@ CONFIG_FSTAB_USER='grml'
 # define guid for rebuildfstab used in /etc/fstab (default: users):
 CONFIG_FSTAB_GROUP='users'
 
-# load ACPI/APM modules (default: yes)
-CONFIG_ACPI_APM='yes'
+# load ACPI modules (default: yes)
+CONFIG_ACPI='yes'
 
 # start syslog-ng (default: yes)
 CONFIG_SYSLOG='yes'
@@ -47,8 +47,6 @@ CONFIG_GPM='yes'
 ################################################################################
 # Notice! Do not touch the following options except you really know
 # what you are doing!
-CONFIG_915RESOLUTION='yes'    # run 915resolution with specified options for adjusting resolution
-CONFIG_AGP='yes'              # check for bootparam forceagp
 CONFIG_AUTOMOUNT='yes'        # automounting of device labeled GRMLCFG
 CONFIG_BLANKING='yes'         # check for bootoption noblank to disable console blanking
 CONFIG_CONFIG='yes'           # do we want config unpacking to work?
@@ -67,7 +65,6 @@ CONFIG_FINDDCSDIR='yes'       # search for a debs, config, scripts directory
 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_KERNEL='yes'           # display information on running kernel
@@ -90,6 +87,7 @@ CONFIG_PASSWD='yes'           # set password via bootparam passwd
 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
+CONFIG_STATS='yes'            # Report stats to stats server
 CONFIG_SSH='yes'              # check for bootparam ssh
 CONFIG_SWRAID='yes'           # check for software raid devices [only in live-mode]
 CONFIG_TESTCD='yes'           # CD checker