X-Git-Url: https://git.grml.org/?p=grml-autoconfig.git;a=blobdiff_plain;f=autoconfig;h=dce5adb4f9af11813901a9173b1324382b6373ee;hp=df1595722083da6a5a583e37ea23e9afcc4ebaa4;hb=9adf1670d57462101cc1eeca041f1fc497688aa1;hpb=9af1e4e4607e9c516ecbe874e6688f13e6d3f93b

diff --git a/autoconfig b/autoconfig
index df15957..dce5adb 100644
--- 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,15 +47,12 @@ 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_AUTOMOUNTER='no'       # activate automounter
 CONFIG_AUTOMOUNT='yes'        # automounting of device labeled GRMLCFG
 CONFIG_BLANKING='yes'         # check for bootoption noblank to disable console blanking
-CONFIG_BLINDSOUND='yes'       # play 'beep' and play welcome message
-CONFIG_BLIND='yes'            # check for blind option or brltty
 CONFIG_CONFIG='yes'           # do we want config unpacking to work?
 CONFIG_CONSOLE='yes'          # activate mgetty when using console=... as bootparam
+CONFIG_CONFIGFS='yes'         # automatically mount configfs
+CONFIG_BRLTTY='yes'           # automatically start brltty if a brltty option is specified in /proc/cmdline
 CONFIG_DEBOOTSTRAP='yes'      # support automatic installation of Debian via grml-deboostrap
 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
@@ -70,15 +67,11 @@ 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_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
 CONFIG_LD_MOD='yes'           # run ldconfig and depmod on systems running from harddisk; remove /etc/grml.first.boot for forcing
-CONFIG_LOCAL_NET='yes'        # bring up loopback interface
 CONFIG_LOG='yes'              # DEBUG=/dev/null or logfile int /tmp/...
 CONFIG_LVM='yes'              # logical volume setup
 CONFIG_MIXER='yes'            # set audio volumes [only in live-cd mode relevant, except for bootoption nosound]
@@ -95,14 +88,14 @@ 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_SWSPEAK='yes'          # run software synthesizer via speakup
 CONFIG_TESTCD='yes'           # CD checker
 CONFIG_TIME='yes'             # set clock, check for bootparam utc/gmt [only in live-mode]
 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_VIRTUALBOX_SHARED_FOLDERS='yes' # set up shared folders in VirtualBox environment
 CONFIG_VNC='yes'              # check for bootparam vnc
 CONFIG_WELCOME='yes'          # play welcome sound (audio)
 CONFIG_WONDERSHAPER='yes'     # start wondershaper with options provided via bootparam
@@ -113,6 +106,6 @@ CONFIG_XSTARTUP='yes'         # start X window system via grml-x [only in live-m
 
 CONFIG_AUTOCONFIG_LOCAL='/etc/grml/autoconfig.local'
 
-[ -e ${CONFIG_AUTOCONFIG_LOCAL} ] && . ${CONFIG_AUTOCONFIG_LOCAL}
+[ -r ${CONFIG_AUTOCONFIG_LOCAL} ] && . ${CONFIG_AUTOCONFIG_LOCAL}
 
 ## END OF FILE #################################################################