Further adaptions regarding new /lib/live directory

[grml-autoconfig.git] / autoconfig

diff --git a/autoconfig b/autoconfig
index 620d9d2..ada7c18 100644 (file)
--- 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
@@ -93,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)
@@ -105,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 #################################################################