[Fai-commit] r5178 - in trunk: debian doc

[lange at alioth.debian.org]

Author: lange
Date: 2008-09-26 10:10:33 +0000 (Fri, 26 Sep 2008)
New Revision: 5178

Modified:
   trunk/debian/changelog
   trunk/doc/fai-guide.sgml
Log:
add info about kernel parameters

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2008-09-25 11:28:10 UTC (rev 5177)
+++ trunk/debian/changelog	2008-09-26 10:10:33 UTC (rev 5178)
@@ -15,12 +15,13 @@
   * fai-debconf.1: minor fixes
   * setup-storage.8: replace mdoc macro version with man macro version,
     reformat examples using tab stops, make groff happy
-  * fai-guide.sgml: remove info about make-fai-bootfloppy
+  * fai-guide.sgml: remove info about make-fai-bootfloppy, add info about
+    kernel parameters
   * faisetup.sgml: update messages
   * bootexample.sgml: update example messages
   * mkdebmirror: remove obsolete code for fetching boot floppy images
 
- -- Thomas Lange <lange at debian.org>  Wed, 24 Sep 2008 18:14:17 +0200
+ -- Thomas Lange <lange at debian.org>  Fri, 26 Sep 2008 12:10:01 +0200
 
 fai (3.2.10) unstable; urgency=low
 

Modified: trunk/doc/fai-guide.sgml
===================================================================
--- trunk/doc/fai-guide.sgml	2008-09-25 11:28:10 UTC (rev 5177)
+++ trunk/doc/fai-guide.sgml	2008-09-26 10:10:33 UTC (rev 5178)
@@ -10,7 +10,7 @@
 <!entity faiverdate "9 Sep 2008">
 
 <!entity version "2.8">
-<!entity date    "25 Sep 2008">
+<!entity date    "26 Sep 2008">
 
 <!entity faisetup           system "entities/faisetup.sgml">
 <!entity bootexample        system "entities/bootexample.sgml">
@@ -1559,7 +1559,19 @@
 
 Additional information is passed via the kernel command line or read
 from &fc;. When booting with PXE, command line parameters are created using <manref
-name="fai-chboot" section="8">. The variable <var>$FAI_FLAGS</var>
+name="fai-chboot" section="8">. 
+
+If you do not boot from network card but from CD-ROM or USB stick, you
+may also give network parameters to the kernel via the kernel command
+line. Two interesting parameters are
+
+ <example>nfsroot=[&lt;server-ip&gt;:]&lt;root-dir&gt;[,&lt;nfs-options&gt;]</example>
+
+ <example>ip=&lt;client-ip&gt;:&lt;server-ip&gt;:&lt;gw-ip&gt;:&lt;netmask&gt;:&lt;hostname&gt;:&lt;device&gt;:&lt;autoconf&gt;</example>
+Those parameters are described in the documentation of the Linux
+kernel sources in <file>/usr/src/linux/Documentation/nfsroot.txt</file>. 
+
+The variable <var>$FAI_FLAGS</var>
 contains a space separated list of flags. The following flags are
 known:
 <taglist>