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

diff --git a/etc/grml/fai/fai.conf b/etc/grml/fai/fai.conf
index f37a52e..c6ede7d 100644
--- a/etc/grml/fai/fai.conf
+++ b/etc/grml/fai/fai.conf
@@ -19,14 +19,12 @@ 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,...
 #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/config
 
 # the following variables are read only for most users
 
@@ -35,4 +33,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