[Fai-commit] r5522 - in trunk: conf debian

[Thomas Lange]

Author: lange
Date: 2009-09-25 09:26:14 +0000 (Fri, 25 Sep 2009)
New Revision: 5522

Modified:
   trunk/conf/fai.conf
   trunk/debian/changelog
Log:
  add comment, rearrange variables, important variables first

Modified: trunk/conf/fai.conf
===================================================================
--- trunk/conf/fai.conf	2009-09-24 09:10:15 UTC (rev 5521)
+++ trunk/conf/fai.conf	2009-09-25 09:26:14 UTC (rev 5522)
@@ -2,9 +2,12 @@
 
 # /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,
+#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.
@@ -19,14 +22,14 @@
 # set protocol type for saving logs. Values: ssh, rsh, ftp
 FAI_LOGPROTO=ssh
 
-# how to access the fai config space
-# default if undefined here: nfs://<install server>/$FAI_CONFIGDIR
-# supported URL-types: nfs, file, cvs, cvs+ssh, svn+file, svn+http,
-# git, git+http, 
-#FAI_CONFIG_SRC=nfs://yourservername/path/to/config/space
+# 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
 
-# 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/debian/changelog
===================================================================
--- trunk/debian/changelog	2009-09-24 09:10:15 UTC (rev 5521)
+++ trunk/debian/changelog	2009-09-25 09:26:14 UTC (rev 5522)
@@ -35,6 +35,7 @@
   * fai-mirror: remove use of $addpackages (closes: #537544)
   * fai.conf, make-fai-nfsroot.conf: move FAI_CONFIGDIR to m-f-n.conf,
     because it's only needed on an install server
+    add comment, rearrange variables, important variables first
   * fai-cd, fai: get FAI_CONFIGDIR from new config file
   * fai-server.preinst, fai-server.prerm, fai-quickstart.postinst: print
     warning if FAI_CONFIGDIR is still in the wrong place
@@ -108,7 +109,7 @@
   [ Holger Levsen ]
   * update to standards version 3.8.2, no changes needed
  
- -- Thomas Lange <lange at debian.org>  Wed, 19 Aug 2009 21:39:59 +0200
+ -- Thomas Lange <lange at debian.org>  Fri, 25 Sep 2009 11:25:53 +0200
 
 fai (3.2.20) unstable; urgency=low