Update FAI configuration.

diff --git a/etc/grml/fai/fai.conf b/etc/grml/fai/fai.conf
index 6f0ab1e..526c17d 100644 (file)
--- a/etc/grml/fai/fai.conf
+++ b/etc/grml/fai/fai.conf
@@ -19,9 +19,6 @@ 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,...
@@ -35,7 +32,7 @@ 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

diff --git a/etc/grml/fai/make-fai-nfsroot.conf b/etc/grml/fai/make-fai-nfsroot.conf
index e8ffc77..b4bdb4b 100644 (file)
--- a/etc/grml/fai/make-fai-nfsroot.conf
+++ b/etc/grml/fai/make-fai-nfsroot.conf
@@ -3,11 +3,14 @@
 
 # directory on the install server where the nfsroot for FAI is
 # created, approx size: 250MB, also defined in bootptab or dhcp.conf
-NFSROOT=/grml/fai/nfsroot
+NFSROOT=/srv/fai/nfsroot
 
 # TFTP root directory
 TFTPROOT=/srv/tftp/fai
 
+# location of the configuration space
+# FAI_CONFIGDIR=/etc/grml/fai/config
+
 # Add a line for mirrorhost and installserver when DNS is not available
 # on the clients. This line(s) will be added to $nfsroot/etc/hosts.
 #NFSROOT_ETC_HOSTS="192.168.1.250 yourinstallserver"
@@ -16,7 +19,7 @@ TFTPROOT=/srv/tftp/fai
 FAI_DEBOOTSTRAP="lenny http://cdn.debian.net/debian"
 
 # which options do you want to use for debootstrap?
-FAI_DEBOOTSTRAP_OPTS="--exclude=dhcp-client,info"
+FAI_DEBOOTSTRAP_OPTS="--exclude=info"
 
 # the encrypted (with md5 or crypt) root password on all install clients during
 # installation process; used when log in via ssh; default pw is: fai
@@ -25,3 +28,7 @@ FAI_ROOTPW='$1$kBnWcO.E$djxB128U7dMkrltJHPf6d1'
 # location of a identity.pub file; this user can log to the install
 # clients in as root without a password; only useful with FAI_FLAGS="sshd"
 #SSH_IDENTITY=/home/admin/.ssh/identity.pub
+
+# directory of hooks to be sourced at the end of make-fai-nfsroot,
+# i.e they have to be shell scripts.
+#NFSROOT_HOOKS=/etc/fai/nfsroot-hooks/