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

[Thomas Lange]

Author: lange
Date: 2009-10-16 11:28:21 +0000 (Fri, 16 Oct 2009)
New Revision: 5534

Modified:
   trunk/debian/changelog
   trunk/doc/fai-guide.txt
Log:
remove info about tftpd in inetd.conf


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2009-10-16 10:09:54 UTC (rev 5533)
+++ trunk/debian/changelog	2009-10-16 11:28:21 UTC (rev 5534)
@@ -72,6 +72,8 @@
   * links.html: remove broken links
   * doc/Makefile: new target for asciidoc documentation
   * doc/fai-guide.txt: fai-guide now written with asciidoc
+    remove information about inetd.conf, sice tftpd is now started as
+    standalone daemon
   * fai-doc.doc-base.package: update file names
   * ftar: add support for .tgz suffix
   * get-config-dir-hg: add support for mercurial (thanks to Darshaka
@@ -115,7 +117,7 @@
   [ Holger Levsen ]
   * update to standards version 3.8.2, no changes needed
  
- -- Thomas Lange <lange at debian.org>  Fri, 09 Oct 2009 11:12:29 +0200
+ -- Thomas Lange <lange at debian.org>  Fri, 16 Oct 2009 13:27:41 +0200
 
 fai (3.2.20) unstable; urgency=low
 

Modified: trunk/doc/fai-guide.txt
===================================================================
--- trunk/doc/fai-guide.txt	2009-10-16 10:09:54 UTC (rev 5533)
+++ trunk/doc/fai-guide.txt	2009-10-16 11:28:21 UTC (rev 5534)
@@ -4,7 +4,7 @@
 FAI Guide (Fully Automatic Installation)
 ========================================
 Thomas Lange <lange at informatik.uni-koeln.de>
-1.0.1, Wed, 23 Sep 2009 16:24:57 +0200
+1.0.2, Fri, 16 Oct 2009 13:22:54 +0200
 
 
 
@@ -606,7 +606,7 @@
 
 === [[pxeboot]]Booting from network card with a PXE conforming boot ROM
 
-Most modern bootable network cards support the PXE boot environment.
+Almost all modern bootable network cards support the PXE boot environment.
 Some network cards (e.g. on notebooks) have a fixed boot
 configuration, so they can only use the PXE boot protocol. This
 requires a PXE Linux boot loader and a special version of the _TFTP_
@@ -621,11 +621,8 @@
 
 Then set up the DHCP daemon. A sample configuration file can be found
 in '/usr/share/doc/fai-doc/examples/etc/dhcpd.conf'. Copy this file to
-'/etc/dhcp3/dhcpd.conf'. Then enable the special tftp daemon using
-this line in file '/etc/inetd.conf':
+'/etc/dhcp3/dhcpd.conf'.
 
-  tftp dgram udp wait root /usr/sbin/in.tftpd in.tftpd -s /srv/tftp/fai
-
 The install client then loads the pxelinux boot loader which receives
 its configuration via TFTP from a file in the directory
 '/srv/tftp/fai/pxelinux.cfg' (defined by the variable +TFTPROOT+ in
@@ -633,12 +630,7 @@
 define which kernel will be loaded by the PXE Linux loader and which
 additional parameters are passed to this kernel. You should read the
 manual pages, which give you some good examples.
-////
-MT: $TFTPROOT only tells FAI where the tftpd directory is found, but what
-you are saying here rather refers to the entry in inetd.conf
-////
 
-
 See '/usr/share/doc/syslinux/pxelinux.doc' for more detailed
 information.