From 765ea3ff7f41c797b088f290d1e1dcc3efb67ac0 Mon Sep 17 00:00:00 2001
From: Frans Pop <elendil@planet.nl>
Date: Mon, 22 Feb 2010 05:16:30 +0000
Subject: Update information on setting up a TFTP server

tftpd-hpa can be run using inetd, but also as an independent daemon.
Mention that and remove some of the technical detail as it should be
set up correctly by default when installing the package.
---
 debian/changelog                    |  1 +
 en/install-methods/install-tftp.xml | 26 +++++++-------------------
 2 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 43efbb8f0..7542cdab0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -45,6 +45,7 @@ installation-guide (2009xxxx) UNRELEASED; urgency=low
   * Update and extend information on preseeding partman. Based on a patch from
     Vincent McIntyre. Closes: #511053.
   * Use 'ip addr' instead of 'ifconfig' to get MAC address for RARP setup.
+  * Update information on setting up a TFTP server.
 
  -- Frans Pop <fjp@debian.org>  Tue, 01 Sep 2009 19:01:59 +0200
 
diff --git a/en/install-methods/install-tftp.xml b/en/install-methods/install-tftp.xml
index cb50a38cf..9ad1ebe80 100644
--- a/en/install-methods/install-tftp.xml
+++ b/en/install-methods/install-tftp.xml
@@ -72,15 +72,15 @@ support.  On a &debian; server, the <classname>atftpd</classname> and
 <para>
 
 To get the TFTP server ready to go, you should first make sure that
-<command>tftpd</command> is enabled.  This is usually enabled by having
-something like the following line in <filename>/etc/inetd.conf</filename>:
+<command>tftpd</command> is enabled.
 
-<informalexample><screen>
-tftp dgram udp wait nobody /usr/sbin/tcpd in.tftpd /tftpboot
-</screen></informalexample>
+</para><para>
 
-Debian packages will in general set this up correctly by default when they
-are installed.
+In the case of <classname>tftpd-hpa</classname> there are two ways the
+service can be run. It can be started on demand by the system's
+<classname>inetd</classname> daemon, or it can be set up to run as an
+independent daemon. Which of these methods is used is selected when the
+package is installed and can be changed by reconfiguring the package.
 
 </para>
 <note><para>
@@ -95,23 +95,11 @@ configuration examples in this section accordingly.
 </para></note>
 <para>
 
-Look in <filename>/etc/inetd.conf</filename> and remember the directory which
-is used as the argument of <command>in.tftpd</command><footnote>
-
-<para>
 All <command>in.tftpd</command> alternatives available in Debian should
 log TFTP requests to the system logs by default. Some of them support a
 <userinput>-v</userinput> argument to increase verbosity.
 It is recommended to check these log messages in case of boot problems
 as they are a good starting point for diagnosing the cause of errors.
-</para>
-
-</footnote>; you'll need that below.
-If you've had to change <filename>/etc/inetd.conf</filename>, you'll have to
-notify the running <command>inetd</command> process that the file has changed.
-On a Debian machine, run <userinput>/etc/init.d/inetd reload</userinput>; on
-other machines, find out the process ID for <command>inetd</command>, and run
-<userinput>kill -HUP <replaceable>inetd-pid</replaceable></userinput>.
 
 </para><para arch="mips">
 
-- 
cgit v1.2.3