Date: Tue, 4 Mar 2014 20:54:37 +0000 (UTC) From: Dru Lavigne <dru@FreeBSD.org> To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r44122 - head/en_US.ISO8859-1/books/handbook/advanced-networking Message-ID: <201403042054.s24Ksbrt007368@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dru Date: Tue Mar 4 20:54:36 2014 New Revision: 44122 URL: http://svnweb.freebsd.org/changeset/doc/44122 Log: Initial prep work to merge Diskless Booting and PXE chapters as much of their content overlaps. The next few commits will merge the content into a readable flow. Sponsored by: iXsystems. Modified: head/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml Modified: head/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml ============================================================================== --- head/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml Tue Mar 4 20:28:29 2014 (r44121) +++ head/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml Tue Mar 4 20:54:36 2014 (r44122) @@ -37,14 +37,7 @@ </listitem> <listitem> - <para>How to set up network booting on a diskless - machine.</para> - </listitem> - - <listitem> - <para>How to set up network <acronym>PXE</acronym> booting - with an - <acronym>NFS</acronym> root file system.</para> + <para>How to set up network <acronym>PXE</acronym> booting.</para> </listitem> <listitem> @@ -3833,7 +3826,7 @@ ifconfig_<literal>lagg0</literal>="laggp <sect1 xml:id="network-diskless"> <info> - <title>Diskless Operation</title> + <title>Diskless Operation with <acronym>PXE</acronym></title> <authorgroup> <author> @@ -4005,9 +3998,6 @@ ifconfig_<literal>lagg0</literal>="laggp </sect2> <sect2> - <title>Setup Instructions</title> - - <sect3> <title>Configuration Using <application>ISC DHCP</application></title> @@ -4101,10 +4091,11 @@ subnet 192.168.4.0 netmask 255.255.255.0 same as the <acronym>TFTP</acronym> one.</para> </callout> </calloutlist> - </sect3> + </sect2> - <sect3> - <title>Booting with <acronym>PXE</acronym></title> + <sect2> + <title>Configuring the <acronym>TFTP</acronym> and + <acronym>NFS</acronym> Servers</title> <para>By default, &man.pxeboot.8; loads the kernel via <acronym>NFS</acronym>. It can be compiled to use @@ -4124,11 +4115,6 @@ subnet 192.168.4.0 netmask 255.255.255.0 select the <literal>Boot from network</literal> option in the <acronym>BIOS</acronym> setup or type a function key during system initialization.</para> - </sect3> - - <sect3> - <title>Configuring the <acronym>TFTP</acronym> and - <acronym>NFS</acronym> Servers</title> <indexterm> <primary>TFTP</primary> @@ -4213,10 +4199,10 @@ subnet 192.168.4.0 netmask 255.255.255.0 <screen>&prompt.root; <userinput>service mountd restart</userinput></screen> </step> </procedure> - </sect3> + </sect2> - <sect3> - <title>Building a Diskless Kernel</title> + <sect2> + <title>Preparing the Root File System</title> <indexterm> <primary>diskless operation</primary> @@ -4252,10 +4238,6 @@ options BOOTP_NFSROOT # NFS mount r <xref linkend="kernelconfig"/>, and copy it to the place specified in <filename>/usr/local/etc/dhcpd.conf</filename>.</para> - </sect3> - - <sect3> - <title>Preparing the Root File System</title> <indexterm> <primary>root file system</primary> @@ -4267,11 +4249,8 @@ options BOOTP_NFSROOT # NFS mount r <literal>root-path</literal> in <filename>/usr/local/etc/dhcpd.conf</filename>.</para> - <sect4> - <title>Using <command>make world</command> to Populate - Root</title> - - <para>This method is quick and will install a complete + <para>Using <command>make world</command> to populate + root is quick and will install a complete virgin system, not just the root file system, into <envar>DESTDIR</envar>. Execute the following script:</para> @@ -4288,18 +4267,14 @@ cd /usr/src/etc; make distribution</prog <filename>/etc/fstab</filename> placed into <envar>DESTDIR</envar> according to the system's requirements.</para> - </sect4> - </sect3> + </sect2> - <sect3> + <sect2> <title>Configuring Swap</title> <para>If needed, a swap file located on the server can be accessed via <acronym>NFS</acronym>.</para> - <sect4> - <title><acronym>NFS</acronym> Swap</title> - <para>The kernel does not support enabling <acronym>NFS</acronym> swap at boot time. Swap must be enabled by the startup scripts, by mounting a writable @@ -4312,30 +4287,21 @@ cd /usr/src/etc; make distribution</prog <filename>/etc/rc.conf</filename>:</para> <programlisting>swapfile=<replaceable>/path/to/swapfile</replaceable></programlisting> - </sect4> - </sect3> + </sect2> - <sect3> + <sect2> <title>Miscellaneous Issues</title> - <sect4> - <title>Running with a Read-only - <filename>/usr</filename></title> - <indexterm> <primary>diskless operation</primary> <secondary>/usr read-only</secondary> </indexterm> <para>If the diskless workstation is configured to run - <application>&xorg;</application>, adjust the + <application>&xorg;</application> and is running with a read-only <filename>/usr</filename>, adjust the <application>XDM</application> configuration file as it puts the error log on <filename>/usr</filename> by default.</para> - </sect4> - - <sect4> - <title>Using a Non-&os; Server</title> <para>When the server for the root file system is not running &os;, create the root file system on a &os; @@ -4349,12 +4315,9 @@ cd /usr/src/etc; make distribution</prog mount this directory onto a &os; machine, and use &man.devfs.5; to allocate device nodes transparently for the user.</para> - </sect4> - </sect3> </sect2> - </sect1> - <sect1 xml:id="network-pxe-nfs"> + <sect2 xml:id="network-pxe-nfs"> <info> <title>PXE Booting with an <acronym>NFS</acronym> Root File System</title> @@ -4398,6 +4361,7 @@ cd /usr/src/etc; make distribution</prog loaded and the rest of the &os; bootup sequence proceeds. Refer to <xref linkend="boot"/> for more information about the &os; booting process.</para> + </sect2> <sect2> <title>Setting Up the &man.chroot.8; Environment for the
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201403042054.s24Ksbrt007368>