[bootlin/training-materials updates] master: Further updates about the tftp server home directory (4cdc6168)

[Michael Opdenacker]

Repository : https://github.com/bootlin/training-materials
On branch  : master
Link       : https://github.com/bootlin/training-materials/commit/4cdc6168cf18f03e2996637c07fbe5a61a37b4c6

>---------------------------------------------------------------

commit 4cdc6168cf18f03e2996637c07fbe5a61a37b4c6
Author: Michael Opdenacker <michael.opdenacker at bootlin.com>
Date:   Tue Feb 23 12:01:18 2021 +0100

    Further updates about the tftp server home directory
    
    - It is now on /srv/tftp if /srv exists on your system
    
    Signed-off-by: Michael Opdenacker <michael.opdenacker at bootlin.com>


>---------------------------------------------------------------

4cdc6168cf18f03e2996637c07fbe5a61a37b4c6
 labs/kernel-board-setup/kernel-board-setup.tex                 | 10 ++++++----
 .../kernel-compiling-and-nfs-booting.tex                       |  4 ++--
 .../yocto-advanced-configuration-stm32.tex                     |  3 ++-
 .../yocto-advanced-configuration.tex                           |  3 ++-
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/labs/kernel-board-setup/kernel-board-setup.tex b/labs/kernel-board-setup/kernel-board-setup.tex
index b729ddd1..c5526246 100644
--- a/labs/kernel-board-setup/kernel-board-setup.tex
+++ b/labs/kernel-board-setup/kernel-board-setup.tex
@@ -217,10 +217,12 @@ Let's install a TFTP server on your development workstation:
 sudo apt install tftpd-hpa
 \end{verbatim}
 
-Once the package is installed, open \code{/etc/default/tftpd-hpa} with your favorite
-text editor, and make sure that the TFTP directory is set to \code{TFTP_DIRECTORY=/var/lib/tftpboot/}.
+Once the package is installed, view the contents of
+\code{/etc/default/tftpd-hpa}, and check what the TFTP server home directory
+(\code{TFTP_DIRECTORY} setting). If \code{/srv} exists on your system,
+it should be \code{/srv/tftp}, otherwise \code{/var/lib/tftpboot/}.
 
-If you need to make a change, then save the changes and restart the TFTP server:
+If you wish to make a change to this file, you will have to restart the TFTP server:
 
 \begin{verbatim}
 sudo /etc/init.d/tftpd-hpa restart
@@ -229,7 +231,7 @@ sudo /etc/init.d/tftpd-hpa restart
 \section{Testing the network connection}
 
 You can then test the TFTP connection.  First, put a small text
-file in \code{/var/lib/tftpboot}. Then, from U-Boot, do:
+file in TFTP server home directory. Then, from U-Boot, do:
 
 \begin{verbatim}
 tftp 0x81000000 textfile.txt
diff --git a/labs/kernel-compiling-and-nfs-booting/kernel-compiling-and-nfs-booting.tex b/labs/kernel-compiling-and-nfs-booting/kernel-compiling-and-nfs-booting.tex
index 86b8b967..9caeeca0 100644
--- a/labs/kernel-compiling-and-nfs-booting/kernel-compiling-and-nfs-booting.tex
+++ b/labs/kernel-compiling-and-nfs-booting/kernel-compiling-and-nfs-booting.tex
@@ -98,7 +98,7 @@ make -j 8
 
 Now, copy the \code{zImage} and \code{am335x-boneblack.dtb}
 or \code{am335x-boneblack-wireless.dtb} files
-to the TFTP server home directory (\code{/var/lib/tftpboot}).
+to the TFTP server home directory (as specified in \code{/etc/default/tftpd-hpa}).
 
 \section{Setting up the NFS server}
 
@@ -190,7 +190,7 @@ also have a look at the NFS server logs in \code{/var/log/syslog}.
 It's often a good idea to make sure you booted the right kernel.
 By mistake, you could have booted a kernel previously stored in flash
 (typically through a default boot command in U-Boot), or forgotten to
-update the kernel image in \code{/var/lib/tftpboot}.
+update the kernel image in the TFTP server home directory.
 
 This could explain some unexpected behavior.
 
diff --git a/labs/yocto-advanced-configuration-stm32/yocto-advanced-configuration-stm32.tex b/labs/yocto-advanced-configuration-stm32/yocto-advanced-configuration-stm32.tex
index 5beb6ae7..f3763a06 100644
--- a/labs/yocto-advanced-configuration-stm32/yocto-advanced-configuration-stm32.tex
+++ b/labs/yocto-advanced-configuration-stm32/yocto-advanced-configuration-stm32.tex
@@ -182,7 +182,8 @@ need to do is:
 \item Install a TFTP server (package \code{tftpd-hpa}) on your system.
 
 \item Copy the Linux kernel image and Device Tree to
-  \code{/var/lib/tftpboot} so that they are made available by the TFTP
+  the TFTP server home directory (specified in
+  \code{/etc/default/tftpd-hpa}) so that they are made available by the TFTP
   server.
 
 \item Change the U-Boot \code{bootcmd} to load the kernel image and
diff --git a/labs/yocto-advanced-configuration/yocto-advanced-configuration.tex b/labs/yocto-advanced-configuration/yocto-advanced-configuration.tex
index 8b011b4c..574f2aeb 100644
--- a/labs/yocto-advanced-configuration/yocto-advanced-configuration.tex
+++ b/labs/yocto-advanced-configuration/yocto-advanced-configuration.tex
@@ -176,7 +176,8 @@ need to do is:
 \item Install a TFTP server (package \code{tftpd-hpa}) on your system.
 
 \item Copy the Linux kernel image and Device Tree to
-  \code{/var/lib/tftpboot} so that they are made available by the TFTP
+  the TFTP server home directory (specified in
+  \code{/etc/default/tftpd-hpa}) so that they are made available by the TFTP
   server.
 
 \item Change the U-Boot \code{bootcmd} to load the kernel image and