X-Git-Url: http://git.grml.org/?p=grml-autoconfig.git;a=blobdiff_plain;f=autoconfig;h=ada7c18e4210a3f7868957275fd98bab4c2f230c;hp=9c1ee17da93f8ce8a51785bfe7fa7f835c533fc3;hb=ec19b33413c8a79c9d65be0f2f4bb62436c690b9;hpb=a5945ace72e7ebc689462fea3947715357a39b3f

diff --git a/autoconfig b/autoconfig
index 9c1ee17..ada7c18 100644
--- a/autoconfig
+++ b/autoconfig
@@ -47,15 +47,17 @@ 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_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?
 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
 CONFIG_DEBUG='yes'            # activate start of shells during startup at several stages
+CONFIG_DISPLAY_SSH_FINGERPRINTS='yes' # display SSH server key fingerprints
 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
@@ -71,7 +73,6 @@ CONFIG_HOSTNAME='yes'         # set hostname to 'grml' on systems running from C
 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]
@@ -88,13 +89,13 @@ 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
 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)
@@ -106,6 +107,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 #################################################################