Whitespace-only fixes, translators please ignore.

This commit is contained in:
Warren Block 2014-11-25 22:47:39 +00:00
parent af0e9df5f5
commit 82c210f9e3
Notes: svn2git 2020-12-08 03:00:23 +00:00
svn path=/head/; revision=46030

View file

@ -725,8 +725,9 @@ route_net2="-net 192.168.1.0/24 192.168.1.1"</programlisting>
<procedure>
<step>
<para>Obtain the <acronym>SSID</acronym> (Service Set
Identifier) and <acronym>PSK</acronym> (Pre-Shared Key) for
the wireless network from the network administrator.</para>
Identifier) and <acronym>PSK</acronym> (Pre-Shared Key)
for the wireless network from the network
administrator.</para>
</step>
<step>
@ -2253,7 +2254,8 @@ freebsdap 00:11:95:c3:0d:ac 1 54M 22:1 100 EPS</screen>
<itemizedlist>
<listitem>
<para>&android; devices generally use the &man.urndis.4; driver.</para>
<para>&android; devices generally use the &man.urndis.4;
driver.</para>
</listitem>
<listitem>
@ -2261,7 +2263,8 @@ freebsdap 00:11:95:c3:0d:ac 1 54M 22:1 100 EPS</screen>
</listitem>
<listitem>
<para>Older devices will often use the &man.cdce.4; driver.</para>
<para>Older devices will often use the &man.cdce.4;
driver.</para>
</listitem>
</itemizedlist>
@ -2931,12 +2934,12 @@ cu -l $PTS</programlisting>
</authorgroup>
</info>
<indexterm>
<primary><acronym>IP</acronym> subnet</primary>
</indexterm>
<indexterm>
<primary>bridge</primary>
</indexterm>
<indexterm>
<primary><acronym>IP</acronym> subnet</primary>
</indexterm>
<indexterm>
<primary>bridge</primary>
</indexterm>
<para>It is sometimes useful to divide a network, such as an
Ethernet segment, into network segments without having to
@ -3833,21 +3836,22 @@ ifconfig_<literal>lagg<replaceable>0</replaceable></literal>="laggproto failover
<sect2 xml:id="network-pxe-nfs">
<info>
<title>Setting Up the <acronym>PXE</acronym> Environment</title>
<title>Setting Up the <acronym>PXE</acronym>
Environment</title>
<authorgroup>
<author>
<personname>
<firstname>Craig</firstname>
<surname>Rodrigues</surname>
</personname>
<affiliation>
<address>rodrigc@FreeBSD.org</address>
</affiliation>
<contrib>Written by </contrib>
</author>
</authorgroup>
</info>
<authorgroup>
<author>
<personname>
<firstname>Craig</firstname>
<surname>Rodrigues</surname>
</personname>
<affiliation>
<address>rodrigc@FreeBSD.org</address>
</affiliation>
<contrib>Written by </contrib>
</author>
</authorgroup>
</info>
<para>The steps shown in this section configure the built-in
<acronym>NFS</acronym> and <acronym>TFTP</acronym> servers.
@ -4057,16 +4061,16 @@ Received 264951 bytes in 0.1 seconds</screen>
}</programlisting>
<!--
<!--
This option still needed?
host corbieres {
<para>This option tells <application>dhcpd</application>
to send the value in the <literal>host</literal>
declarations as the hostname for the diskless host.
An alternate way would be to add an <literal>option
host-name <replaceable>corbieres</replaceable></literal>
inside the <literal>host</literal> declarations.</para>
-->
<para>This option tells <application>dhcpd</application>
to send the value in the <literal>host</literal>
declarations as the hostname for the diskless host.
An alternate way would be to add an <literal>option
host-name <replaceable>corbieres</replaceable></literal>
inside the <literal>host</literal> declarations.</para>
-->
<para>The <literal>next-server</literal> directive is used to
specify the <acronym>IP</acronym> address of the
@ -4092,121 +4096,122 @@ Received 264951 bytes in 0.1 seconds</screen>
</sect2>
<!--
Are these sections still needed?
<sect2>
<title>Preparing the Root File System</title>
<sect2>
<title>Preparing the Root File System</title>
<indexterm>
<primary>diskless operation</primary>
<secondary>kernel configuration</secondary>
</indexterm>
<indexterm>
<primary>diskless operation</primary>
<secondary>kernel configuration</secondary>
</indexterm>
<para>When using <acronym>PXE</acronym>, building a custom
kernel with the following options is not strictly necessary.
These options cause more <acronym>DHCP</acronym> requests
to be issued during kernel startup, with a small risk of
inconsistency between the new values and those retrieved
by &man.pxeboot.8; in some special cases. The advantage
is that the host name will be set. Otherwise, set the
host name in a client-specific
<filename>/etc/rc.conf</filename>.</para>
<para>When using <acronym>PXE</acronym>, building a custom
kernel with the following options is not strictly necessary.
These options cause more <acronym>DHCP</acronym> requests
to be issued during kernel startup, with a small risk of
inconsistency between the new values and those retrieved
by &man.pxeboot.8; in some special cases. The advantage
is that the host name will be set. Otherwise, set the
host name in a client-specific
<filename>/etc/rc.conf</filename>.</para>
<programlisting>options BOOTP # Use BOOTP to obtain IP address/hostname
<programlisting>options BOOTP # Use BOOTP to obtain IP address/hostname
options BOOTP_NFSROOT # NFS mount root file system using BOOTP info</programlisting>
<para>The custom kernel can also include
<literal>BOOTP_NFSV3</literal>,
<literal>BOOT_COMPAT</literal> and
<literal>BOOTP_WIRED_TO</literal>. Refer to
<filename>NOTES</filename> for descriptions of these
options.</para>
<para>The custom kernel can also include
<literal>BOOTP_NFSV3</literal>,
<literal>BOOT_COMPAT</literal> and
<literal>BOOTP_WIRED_TO</literal>. Refer to
<filename>NOTES</filename> for descriptions of these
options.</para>
<para>These option names are historical and slightly
misleading as they actually enable indifferent use of
<acronym>DHCP</acronym> and <acronym>BOOTP</acronym>
inside the kernel.</para>
<para>These option names are historical and slightly
misleading as they actually enable indifferent use of
<acronym>DHCP</acronym> and <acronym>BOOTP</acronym>
inside the kernel.</para>
<para>Build the custom kernel, using the instructions in
<xref linkend="kernelconfig"/>, and copy it to the place
specified in
<filename>/usr/local/etc/dhcpd.conf</filename>.</para>
<para>Build the custom kernel, using the instructions in
<xref linkend="kernelconfig"/>, and copy it to the place
specified in
<filename>/usr/local/etc/dhcpd.conf</filename>.</para>
<indexterm>
<primary>root file system</primary>
<secondary>diskless operation</secondary>
</indexterm>
<indexterm>
<primary>root file system</primary>
<secondary>diskless operation</secondary>
</indexterm>
<para>Create a root file system for the diskless
workstations in the location listed as
<literal>root-path</literal> in
<filename>/usr/local/etc/dhcpd.conf</filename>.</para>
<para>Create a root file system for the diskless
workstations in the location listed as
<literal>root-path</literal> in
<filename>/usr/local/etc/dhcpd.conf</filename>.</para>
<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>
<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>
<programlisting>#!/bin/sh
<programlisting>#!/bin/sh
export DESTDIR=/data/misc/diskless
mkdir -p ${DESTDIR}
cd /usr/src; make buildworld &amp;&amp; make buildkernel
make installworld &amp;&amp; make installkernel
cd /usr/src/etc; make distribution</programlisting>
<para>Once done, customize
<filename>/etc/rc.conf</filename> and
<filename>/etc/fstab</filename> placed into
<envar>DESTDIR</envar> according to the system's
requirements.</para>
</sect2>
<sect2>
<title>Configuring Swap</title>
<para>If needed, a swap file located on the server can be
accessed via <acronym>NFS</acronym>.</para>
<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
file system and creating and enabling a swap file. To
create a swap file:</para>
<screen>&prompt.root; <userinput>dd if=/dev/zero of=<replaceable>/path/to/swapfile</replaceable> bs=1k count=1 oseek=<replaceable>100000</replaceable></userinput></screen>
<para>To enable the swap file, add the following line to
<filename>/etc/rc.conf</filename>:</para>
<programlisting>swapfile=<replaceable>/path/to/swapfile</replaceable></programlisting>
</sect2>
<sect2>
<title>Miscellaneous Issues</title>
<indexterm>
<primary>diskless operation</primary>
<secondary>/usr read-only</secondary>
</indexterm>
<para>If the diskless workstation is configured to run
<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>
<para>When the server for the root file system is not
running &os;, create the root file system on a &os;
machine, then copy it to its destination, using
&man.tar.1; or &man.cpio.1;.</para>
<para>In this situation, there are sometimes problems with
the special files in <filename>/dev</filename>, due to
differing major/minor integer sizes. A solution to this
problem is to export a directory from the non-&os; server,
mount this directory onto a &os; machine, and use
&man.devfs.5; to allocate device nodes transparently for
the user.</para>
<para>Once done, customize
<filename>/etc/rc.conf</filename> and
<filename>/etc/fstab</filename> placed into
<envar>DESTDIR</envar> according to the system's
requirements.</para>
</sect2>
-->
<sect2>
<title>Configuring Swap</title>
<para>If needed, a swap file located on the server can be
accessed via <acronym>NFS</acronym>.</para>
<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
file system and creating and enabling a swap file. To
create a swap file:</para>
<screen>&prompt.root; <userinput>dd if=/dev/zero of=<replaceable>/path/to/swapfile</replaceable> bs=1k count=1 oseek=<replaceable>100000</replaceable></userinput></screen>
<para>To enable the swap file, add the following line to
<filename>/etc/rc.conf</filename>:</para>
<programlisting>swapfile=<replaceable>/path/to/swapfile</replaceable></programlisting>
</sect2>
<sect2>
<title>Miscellaneous Issues</title>
<indexterm>
<primary>diskless operation</primary>
<secondary>/usr read-only</secondary>
</indexterm>
<para>If the diskless workstation is configured to run
<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>
<para>When the server for the root file system is not
running &os;, create the root file system on a &os;
machine, then copy it to its destination, using
&man.tar.1; or &man.cpio.1;.</para>
<para>In this situation, there are sometimes problems with
the special files in <filename>/dev</filename>, due to
differing major/minor integer sizes. A solution to this
problem is to export a directory from the non-&os; server,
mount this directory onto a &os; machine, and use
&man.devfs.5; to allocate device nodes transparently for
the user.</para>
</sect2>
-->
<sect2>
<title>Debugging <acronym>PXE</acronym> Problems</title>
@ -5191,7 +5196,7 @@ ifconfig_carp0="vhid <replaceable>1</replaceable> advskew <replaceable>100</repl
ifconfig_carp1="vhid <replaceable>2</replaceable> advskew <replaceable>100</replaceable> pass <replaceable>testpass</replaceable> <replaceable>192.168.1.51/24</replaceable>"</programlisting>
<note>
<para>Preemption is disabled in the GENERIC &os; kernel. If
<para>Preemption is disabled in the GENERIC &os; kernel. If
preemption has been enabled with a custom kernel,
<systemitem>hostc.example.org</systemitem> may not release
the <acronym>IP</acronym> address back to the original