X-Git-Url: http://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Ffai.conf;h=b5f47cf8a906c0b75e28180908f08c5663bd5d16;hp=f37a52e3b2d2ac2713ca464398f50db2e95eb057;hb=HEAD;hpb=3ff2a862f83553916a1148543d69a0bbcc97bf4d

diff --git a/etc/grml/fai/fai.conf b/etc/grml/fai/fai.conf
index f37a52e..b5f47cf 100644
--- a/etc/grml/fai/fai.conf
+++ b/etc/grml/fai/fai.conf
@@ -1,6 +1,4 @@
-# $Id: fai.conf 4294 2007-06-10 11:06:11Z lange $
-
-# /etc/fai/fai.conf -- configuration for FAI (Fully Automatic Installation)
+# fai.conf -- configuration for FAI (Fully Automatic Installation)
 
 # Access to Debian mirror via NFS mounted directory
 # If FAI_DEBMIRROR is defined, install clients mount it to $MNTPOINT
@@ -19,14 +17,13 @@ LOGUSER=
 # set protocol type for saving logs. Values: ssh, rsh, ftp
 FAI_LOGPROTO=ssh
 
-# the configuration space on the install server
-FAI_CONFIGDIR=/etc/grml/fai/config
-
 # how to access the fai config space
-# default if undefined here: nfs://`hostname`/$FAI_CONFIGDIR
 # supported URL-types: nfs, file, cvs, cvs+ssh, svn+file, svn+http,...
+# NOTE: grml-live set's the values according to command line options,
+# please adjust here only if you know what you're doing
 #FAI_CONFIG_SRC=nfs://yourservername$FAI_CONFIGDIR
-FAI_CONFIG_SRC=file:///etc/grml/fai
+#FAI_CONFIG_SRC=file:///etc/grml/fai/config
+#FAI_CONFIGDIR=/etc/grml/fai
 
 # the following variables are read only for most users
 
@@ -35,4 +32,8 @@ MNTPOINT=/media/mirror
 
 # the local configuration directory on the install client
 #FAI=/var/lib/fai/config
-FAI=/etc/grml/fai/config
+#FAI=/etc/grml/fai/config
+
+# errors greater STOP_ON_ERROR will cause fai to stop the installation
+# default: 700
+#STOP_ON_ERROR=300