[Fai-commit] r5666 - in trunk: . bin debian doc

[Thomas Lange]

Author: lange
Date: 2009-11-16 17:22:12 +0000 (Mon, 16 Nov 2009)
New Revision: 5666

Modified:
   trunk/THANKS
   trunk/bin/make-fai-nfsroot
   trunk/debian/changelog
   trunk/doc/fai-guide.txt
Log:
* make-fai-nfsroot: do not remove fai.conf from upstart directory
  (Thanks to Waldemar Brodkorb for the patch)
* fai-guide.txt: minor fixes (Thanks to Waldemar for the patch)
* THANKS: add Waldemar

Modified: trunk/THANKS
===================================================================
--- trunk/THANKS	2009-11-16 17:04:47 UTC (rev 5665)
+++ trunk/THANKS	2009-11-16 17:22:12 UTC (rev 5666)
@@ -7,6 +7,7 @@
 Diego Biurrun		diego at biurrun.de
 Phil Biondi		biondi at cartel-securite.fr
 Frédéric Boiteux	fboiteux at prosodie.com
+Waldemar Brodkorb	fai at waldemar-brodkorb.de
 Tobias Burnus		tobias.burnus at physik.fu-berlin.de
 Luk Claes		luk.claes at ugent.be
 Bruce Edge		bedge at troikanetworks.com

Modified: trunk/bin/make-fai-nfsroot
===================================================================
--- trunk/bin/make-fai-nfsroot	2009-11-16 17:04:47 UTC (rev 5665)
+++ trunk/bin/make-fai-nfsroot	2009-11-16 17:22:12 UTC (rev 5666)
@@ -341,7 +341,7 @@
     ln -sf /usr/share/zoneinfo/$timezone etc/localtime
     ln -sf /proc/mounts etc/mtab
     [ -f etc/init/tty1.conf ] || ln -s /usr/sbin/fai etc/init.d/rcS
-    find etc/init ! -type d | egrep -v "udev|hostname|mountall" | xargs -r rm
+    find etc/init ! -type d | egrep -v "fai|udev|hostname|mountall" | xargs -r rm
 
     rm -f etc/udev/rules.d/70-persistent-net.rules 
     # definition for loopback device

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2009-11-16 17:04:47 UTC (rev 5665)
+++ trunk/debian/changelog	2009-11-16 17:22:12 UTC (rev 5666)
@@ -1,3 +1,13 @@
+fai (3.3.2) unstable; urgency=low
+
+  [ Thomas Lange ]
+  * make-fai-nfsroot: do not remove fai.conf from upstart directory
+    (Thanks to Waldemar Brodkorb for the patch)
+  * fai-guide.txt: minor fixes (Thanks to Waldemar for the patch)
+  * THANKS: add Waldemar
+
+ -- Thomas Lange <lange at debian.org>  Mon, 16 Nov 2009 18:20:49 +0100
+
 fai (3.3.1) unstable; urgency=low
 
   [ Thomas Lange ]

Modified: trunk/doc/fai-guide.txt
===================================================================
--- trunk/doc/fai-guide.txt	2009-11-16 17:04:47 UTC (rev 5665)
+++ trunk/doc/fai-guide.txt	2009-11-16 17:22:12 UTC (rev 5666)
@@ -189,7 +189,7 @@
 * Local file systems, their types, mount points and mount options
 * Software packages
 * Keyboard layout, time zone, NIS, Xorg configuration, remote file
-  systems, user accounts,printers ... 
+  systems, user accounts, printers ... 
 
 nfsroot::
 A file system located on the install server. It's the complete file
@@ -689,7 +689,7 @@
 unique MAC addresses with these commands:
 
 ----
-faiserver$ perl -ane 'print "\U$F[0]\n"' /tmp/mac.lis|sort|uniq
+faiserver$ perl -ane 'print "\U$F[0]\n"' /tmp/mac.list|sort|uniq
 ----
 
 After that, you only have to assign these MAC addresses to host names
@@ -931,7 +931,7 @@
 You can monitor the installation of all install clients with the
 command `faimond(8)`. All clients check if this daemon is running on
 the install server (or the machine defined by the variable
-+$monserver+. Then, a message is sent when a task starts and ends. The
++$monserver+). Then, a message is sent when a task starts and ends. The
 fai monitor daemon prints this messages to standard output. There's
 also a graphical frontend available, called `faimond-gui(1)`.
 
@@ -2001,7 +2001,7 @@
 Output of the partition tool `setup-storage(8)`.
 
 shell.log::
-Output of all shell script, that are used for customization.
+Output of all shell scripts, that are used for customization.
 
 variables.log::
 A list of all shell variables which are available during an
@@ -2642,7 +2642,7 @@
 ----
 
 - You can also delete the host entry on your install client in your
-_~/.ssh/known_hosts_ file by unsing the _ssh-keygen -R_ command.
+_~/.ssh/known_hosts_ file by using the _ssh-keygen -R_ command.
 
 - In the tasks chboot and savelog, a connection using secure shell is
 opened to the FAI server (see <<isavelog>>). To ensure that this works
@@ -2655,11 +2655,11 @@
 
 - You can calculate the IP subnet address by using the
 nice tool ipcalc. Following example gives you the notation for a class
-C network (16) when the server netork interface has the IP address
+C network (24) when the server network interface has the IP address
 123.45.6.123
 
 ----
-$ ipcalc -nb 123.45.6.123 16|grep Network:
+$ ipcalc -nb 123.45.6.123 24|grep Network:
 ----
 
 - You can merge two directories which contain configuration information,