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

[lange at alioth.debian.org]

Author: lange
Date: 2008-09-17 13:38:08 +0000 (Wed, 17 Sep 2008)
New Revision: 5167

Modified:
   trunk/debian/changelog
   trunk/doc/fai-guide.sgml
Log:
fai-guide.sgml: remove info about make-fai-bootfloppy

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2008-09-16 17:02:15 UTC (rev 5166)
+++ trunk/debian/changelog	2008-09-17 13:38:08 UTC (rev 5167)
@@ -13,8 +13,9 @@
   * make-fai-nfsroot.8: 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
 
- -- Thomas Lange <lange at debian.org>  Tue, 16 Sep 2008 19:01:42 +0200
+ -- Thomas Lange <lange at debian.org>  Wed, 17 Sep 2008 15:37:47 +0200
 
 fai (3.2.10) unstable; urgency=low
 

Modified: trunk/doc/fai-guide.sgml
===================================================================
--- trunk/doc/fai-guide.sgml	2008-09-16 17:02:15 UTC (rev 5166)
+++ trunk/doc/fai-guide.sgml	2008-09-17 13:38:08 UTC (rev 5167)
@@ -678,8 +678,8 @@
 <sect id="bootfloppy">Creating a boot floppy
 <p>
 
-If your network card can't boot by itself, you have two options. The
-first is to create a small boot floppy that uses etherboot, which
+If your network card can't boot by itself, you can create a small
+ boot floppy that uses etherboot, which
 will provide the PXE feature for your network card. So you can
 use DHCP and TFTP to get the install kernel that was created with
 <manref name="mknbi-linux" section="8">.  A lot of ethernet cards
@@ -688,29 +688,6 @@
 depth documentation about booting via ethernet may be found at
 <httpsite>www.etherboot.org</httpsite>.
 
-<!--MT: not all install clients, but only those of a single architecture-->
-The second option is to boot via floppy disk that is created with the
-command <manref name="make-fai-bootfloppy" section="8">. Since there's
-no client specific 
-information on this floppy, it's suitable for all your install
-clients. You can also specify additional kernel parameters for this
-boot floppy or set other variables, if desired. Do not enable BOOTP
-support when you have a DHCP server running in your network and vice
-versa. This could lead to missing information. There's also a manual
-page for <manref name="make-fai-bootfloppy" section="8">. If you have
-no BOOTP or DHCP server, supply the network configuration as kernel
-parameters. The format is
-<p>
-<tt>ip=&lt;client-ip&gt;:&lt;server-ip&gt;:&lt;gw-ip&gt;:&lt;netmask&gt;:&lt;host-name&gt;:&lt;device&gt;:&lt;autoconf&gt;
-</tt>
-for setting up the network and
-<tt>nfsroot=[&lt;server-ip&gt;:]&lt;root-dir&gt;[,&lt;nfs-options&gt;]</tt>
-for specifying the nfsroot (which is required as the default path is not
-suitable for FAI.)
-<p>
-For additional information see
-<file>/usr/src/linux/Documentation/nfsroot.txt</file> in the kernel
-sources.
 
 <sect id="cdboot">Booting from a CD-ROM<p>