[Fai-commit] r5579 - in trunk: debian examples/simple/files/etc/fai/fai.conf examples/simple/files/etc/fai/make-fai-nfsroot.conf
Thomas Lange
lange at alioth.debian.org
Tue Oct 20 14:09:05 UTC 2009
Author: lange
Date: 2009-10-20 14:09:04 +0000 (Tue, 20 Oct 2009)
New Revision: 5579
Modified:
trunk/debian/changelog
trunk/examples/simple/files/etc/fai/fai.conf/FAISERVER
trunk/examples/simple/files/etc/fai/make-fai-nfsroot.conf/FAISERVER
Log:
examples/simple/files/etc/fai/*: update to more recent config files
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2009-10-20 14:04:35 UTC (rev 5578)
+++ trunk/debian/changelog 2009-10-20 14:09:04 UTC (rev 5579)
@@ -100,6 +100,7 @@
since it's now in the default configuration of debootstrap
* NFSROOT: remove cvs, bootpc, expect, mdetect
* mkdebmirror: update for lenny, use cache feature of debmirror > 2
+ * examples/simple/files/etc/fai/*: update to more recent config files
[ Michael Tautschnig ]
* setup-storage, setup-storage/Exec.pm: auto-detect a proper way to tell
Modified: trunk/examples/simple/files/etc/fai/fai.conf/FAISERVER
===================================================================
--- trunk/examples/simple/files/etc/fai/fai.conf/FAISERVER 2009-10-20 14:04:35 UTC (rev 5578)
+++ trunk/examples/simple/files/etc/fai/fai.conf/FAISERVER 2009-10-20 14:09:04 UTC (rev 5579)
@@ -1,10 +1,13 @@
-# $Id: fai.conf 3770 2006-08-07 12:08:51Z lange $
+# $Id: fai.conf 5526 2009-09-28 08:29:37Z lange $
# /etc/fai/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
-#FAI_DEBMIRROR=yournfs debianmirror:/path/to/debianmirror
+# how to access the fai config space
+# If undefined here, make-fai-nfsroot/fai-setup will use default value
+# nfs://<install server>/$FAI_CONFIGDIR
+# supported URL-types: nfs, file, cvs, cvs+ssh, svn+file, svn+http,
+# git, git+http, hg+http
+#FAI_CONFIG_SRC=nfs://yourservername/path/to/config/space
# LOGUSER: an account on the install server which saves all log-files
# and which can change the kernel that is booted via network.
@@ -17,16 +20,15 @@
LOGUSER=fai
# set protocol type for saving logs. Values: ssh, rsh, ftp
-FAI_LOGPROTO=rsh
+FAI_LOGPROTO=ssh
-# the configuration space on the install server
-FAI_CONFIGDIR=/srv/fai/config
+# Access to Debian mirror via NFS mounted directory
+# If FAI_DEBMIRROR is defined, install clients mount it to $MNTPOINT
+#FAI_DEBMIRROR=yournfs debianmirror:/path/to/debianmirror
-# how to access the fai config space
-# default if undefined here: nfs://`hostname`/$FAI_CONFIGDIR
-#FAI_CONFIG_SRC=nfs://yourservername$FAI_CONFIGDIR
-# the following variables are read only for most users
+# The following variables are read only for almost every user.
+# Do not change them unless you know what you are doing!
# mount point where the mirror will be mounted
MNTPOINT=/media/mirror
Modified: trunk/examples/simple/files/etc/fai/make-fai-nfsroot.conf/FAISERVER
===================================================================
--- trunk/examples/simple/files/etc/fai/make-fai-nfsroot.conf/FAISERVER 2009-10-20 14:04:35 UTC (rev 5578)
+++ trunk/examples/simple/files/etc/fai/make-fai-nfsroot.conf/FAISERVER 2009-10-20 14:09:04 UTC (rev 5579)
@@ -2,13 +2,20 @@
# here you can use also variables defined in fai.conf
# directory on the install server where the nfsroot for FAI is
-# created, approx size: 250MB, also defined in bootptab or dhcp.conf
+# created, approx size: 390MB, also defined in bootptab or dhcp.conf
NFSROOT=/srv/fai/nfsroot
+# TFTP directory for FAI files
+TFTPROOT=/srv/tftp/fai
+
+# location of the configuration space on the install server
+FAI_CONFIGDIR=/srv/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 faiserver"
+# Parameter for debootstrap: "<suite> <mirror>"
FAI_DEBOOTSTRAP="lenny http://faiserver/debian"
# the encrypted (with md5 or crypt) root password on all install clients during
@@ -18,7 +25,12 @@
# 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/
+
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# following lines should be read only for most of you
-FAI_DEBOOTSTRAP_OPTS="--exclude=dhcp-client,info"
+FAI_DEBOOTSTRAP_OPTS="--exclude=info"
More information about the Fai-commit
mailing list