From ca04529693893fd76013beb23cff7ee69b2a2c3e Mon Sep 17 00:00:00 2001
From: Rodrigo Osorio <rodrigo@FreeBSD.org>
Date: Mon, 5 Mar 2018 15:50:47 +0000
Subject: [PATCH] update/correct the Handbook Diskless operations chapter

- Add the -maproot=root to the NFS export configuration
- Mention base archive from the ftp server as an alternative way to install the base system
- Fix the <command> usage
- Add details about how to use md_size files to increase the default mfs size for /var and /etc

PR:		213175
Submitted by:   Natacha Porte <natbsd@instinctive.eu>
Reviewed by:	sevan bcr ian
Approved by:	ian sevan
Sponsored by:	The FreeBSD Foundation
Differential Revision:	https://reviews.freebsd.org/D14336
---
 .../handbook/advanced-networking/chapter.xml  | 39 ++++++++++---------
 1 file changed, 21 insertions(+), 18 deletions(-)

diff --git a/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml b/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml
index cd7f7badf4..318879762f 100644
--- a/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml
@@ -3898,7 +3898,7 @@ ifconfig_<literal>lagg<replaceable>0</replaceable></literal>="up laggproto failo
 	    <acronym>NFS</acronym> by adding the following to
 	    <filename>/etc/exports</filename>:</para>
 
-	  <programlisting>/b -ro -alldirs</programlisting>
+	  <programlisting>/b -ro -alldirs -maproot=root</programlisting>
 	</step>
 
 	<step>
@@ -3937,22 +3937,16 @@ ifconfig_<literal>lagg<replaceable>0</replaceable></literal>="up laggproto failo
 	</step>
 
 	<step>
-	  <para>Rebuild the &os; kernel and userland (refer to <xref
-	      linkend="makeworld"/> for more detailed
-	    instructions):</para>
-
-	  <screen>&prompt.root; <userinput>cd /usr/src</userinput>
-&prompt.root; <userinput>make buildworld</userinput>
-&prompt.root; <userinput>make buildkernel</userinput></screen>
-	</step>
-
-	<step>
-	  <para>Install &os; into the directory mounted over
-	    <acronym>NFS</acronym>:</para>
-
-	  <screen>&prompt.root; <userinput>make installworld DESTDIR=${NFSROOTDIR}</userinput>
-&prompt.root; <userinput>make installkernel DESTDIR=${NFSROOTDIR}</userinput>
-&prompt.root; <userinput>make distribution DESTDIR=${NFSROOTDIR}</userinput></screen>
+	  <para>Install the base system into
+		<filename>${NFSROOTDIR}</filename>, either by
+		decompressing the official archives or by rebuilding
+		the &os; kernel and userland (refer to
+		<xref linkend="makeworld"/> for more detailed
+		instructions, but do not forget to add
+		<option>DESTDIR=<replaceable>${NFSROOTDIR}</replaceable></option>
+		when running the
+		<command>make installkernel</command> and
+		<command>make installworld</command> commands.</para>
 	</step>
 
 	<step>
@@ -4026,7 +4020,16 @@ Received 264951 bytes in 0.1 seconds</screen>
 	<filename>/etc</filename> and <filename>/var</filename> will
 	be created and mounted and the contents of the
 	<filename>cpio.gz</filename> files will be copied into
-	them.</para>
+	them.  By default, these file systems have a maximum capacity
+	of 5 megabytes.  If your archives do not fit, which is
+	usually the case for <filename>/var</filename> when binary
+	packages have been installed, request a larger size by putting
+	the number of 512 byte sectors needed (e.g., 5 megabytes
+	is 10240 sectors) in
+	<filename>${NFSROOTDIR}/conf/base/etc/md_size</filename> and
+	<filename>${NFSROOTDIR}/conf/base/var/md_size</filename>
+	files for <filename>/etc</filename> and
+	<filename>/var</filename> file systems respectively.</para>
     </sect2>
 
     <sect2 xml:id="network-pxe-setting-up-dhcp">