X-Git-Url: http://git.grml.org/?p=grml-autoconfig.git;a=blobdiff_plain;f=autoconfig;h=2cfb2471fcb887621dcf6fac712b7006d099c49f;hp=363fa803790bed23920409de5348ec59d26e6411;hb=771a04d032d43e9a45ad7ac4c9c03d82ed08ba7c;hpb=bc6656c8a62d5b89aad347ebed4c81cc14e8cbdd

diff --git a/autoconfig b/autoconfig
index 363fa80..2cfb247 100644
--- a/autoconfig
+++ b/autoconfig
@@ -1,11 +1,17 @@
 # Filename:      /etc/grml/autoconfig
-# Purpose:       configuration for grml-autoconfig
+# Purpose:       global configuration for grml-autoconfig
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2.
 ################################################################################
 
 ################################################################################
+# Notice: Please do not edit this file! Use grml-autoconfig or
+# /etc/grml/autoconfig.local instead!
+################################################################################
+
+
+################################################################################
 # Notice: you can configure grml-autoconfig via adjusting the following values.
 # Set them to 'yes' to activate them and to 'no' to deactivate them.
 # But please notice that some options might require an additional bootparam
@@ -95,6 +101,7 @@ CONFIG_MOUSE='yes'            # show mouse information (expert-mode)
 CONFIG_MYCONFIG='yes'         # check if we want the config floppy
 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=...
 CONFIG_NETIPV6='yes'          # check for bootparam ipv6
 CONFIG_PARTCONF='yes'	      # do we want partconf to work?
 CONFIG_PASSWD='yes'           # set password via bootparam passwd
@@ -116,4 +123,12 @@ CONFIG_VMWARE='yes'           # vmware specific stuff (use xorg.conf.vmware)
 CONFIG_WELCOME='yes'          # play welcome sound (audio)
 CONFIG_WONDERSHAPER='yes'     # start wondershaper with options provided via bootparam
 CONFIG_XSTARTUP='yes'         # start X window system via grml-x [only in live-mode]
+
+
+# config for local configuration file
+
+CONFIG_AUTOCONFIG_LOCAL='/etc/grml/autoconfig.local'
+
+[ -e ${CONFIG_AUTOCONFIG_LOCAL} ] && . ${CONFIG_AUTOCONFIG_LOCAL}
+
 ## END OF FILE #################################################################