Default DCSDIR to /live/image also in noautoconfig/forensic mode

[grml-autoconfig.git] / autoconfig

diff --git a/autoconfig b/autoconfig
index 807d16b..ada7c18 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,20 +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_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
 CONFIG_DEBUG='yes'            # activate start of shells during startup at several stages
-CONFIG_DISCOVER='no'          # use discover for hardware detection
+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
@@ -68,22 +65,14 @@ CONFIG_DMRAID='yes'           # support for dmraid
 CONFIG_EXTRACT='yes'          # specify which (only in combination with bootparam myconfig/netconfig useful)
 CONFIG_FAST='yes'             # skip startup of w3m on tty1
 CONFIG_FINDDCSDIR='yes'       # search for a debs, config, scripts directory
-CONFIG_FIREWIRE_DEV='no'      # bugfix for kernel >=2.6.11 - create some firewire-devices
 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_HOTPLUG_AGENT='no'     # deactivate specific hotplug agent(s) via bootparam
-CONFIG_HOTPLUG_BLACKLIST='no' # check for blacklist bootparam
-CONFIG_HOTPLUG_MAIN='no'      # start hotplug system [should be handled by udev now]
-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]
@@ -97,18 +86,17 @@ CONFIG_NETSCRIPT='yes'        # download and run script/executable provided by b
 CONFIG_NETIPV6='yes'          # check for bootparam ipv6
 CONFIG_PARTCONF='yes'         # do we want partconf to work?
 CONFIG_PASSWD='yes'           # set password via bootparam passwd
-CONFIG_PCMCIA='no'            # check for pcmcia and start cardmgr
 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
@@ -119,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 #################################################################