X-Git-Url: http://git.grml.org/?p=grml-autoconfig.git;a=blobdiff_plain;f=autoconfig;h=f02415445a49b7a991a042aa28448e5154d87c94;hp=29a6d67381d334b382b45dfd62fb07882268cda5;hb=a64a1f09d039ac261ea3d8cba8add283ae61b3c2;hpb=df29c9febe86bbc6bfcd8fd20da28b7bad86307e

diff --git a/autoconfig b/autoconfig
index 29a6d67..f024154 100644
--- a/autoconfig
+++ b/autoconfig
@@ -51,10 +51,13 @@ 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
@@ -70,14 +73,13 @@ 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]
 CONFIG_MODEM='yes'            # check for AC'97 Modem Controller modem
 CONFIG_MODULES='yes'          # load modules specified in /etc/grml/modules
 CONFIG_MOUSE='yes'            # show mouse information (expert-mode)
-CONFIG_MYCONFIG='yes'         # check if we want the config floppy
+CONFIG_MYCONFIG='yes'         # check if we want the GRMLCFG device
 CONFIG_MYPATH='yes'           # provide setting additional paths via bootoption mypath
 CONFIG_NETCONFIG='yes'        # download configuration archive provided by bootoption netconfig=...
 CONFIG_NETSCRIPT='yes'        # download and run script/executable provided by bootoption netscript=...
@@ -94,7 +96,6 @@ 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 #################################################################