Initial support of UTF-8. Thanks Alexander Patrakov.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@7245 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

1 files changed, 29 insertions, 14 deletions

diff --git a/chapter06/iproute2.xml b/chapter06/iproute2.xml
index 66d1ea86c..09d61143a 100644
--- a/chapter06/iproute2.xml
+++ b/chapter06/iproute2.xml
@@ -25,22 +25,12 @@
     <segmentedlist>
       <segtitle>&dependencies;</segtitle>
       <seglistitem>
-        <seg>GCC, Glibc, Make, Linux-Headers, and Sed</seg>
+        <seg>DB, GCC, Glibc, Make, and Linux-Headers</seg>
       </seglistitem>
     </segmentedlist>
   </sect2>
   <sect2 role="installation">
     <title>Installation of IPRoute2</title>
-    <para>The <command>arpd</command> binary included in this package is
-          dependent on Berkeley DB.  Because <command>arpd</command> is not a very
-          common requirement on a base Linux system, remove the dependency on
-          Berkeley DB by applying the <command>sed</command> command below.  If 
-          the <command>arpd</command> binary is needed, instructions for
-          compiling Berkeley DB can be found in the BLFS Book at <ulink
-          url="&blfs-root;view/svn/server/databases.html#db"/>.
-    </para>
-
-    <screen><userinput>sed -i '/^TARGETS/s@arpd@@g' misc/Makefile</userinput></screen>
 
     <para>Prepare IPRoute2 for compilation:</para>
     <screen><userinput>chmod u+x configure &amp;&amp;
@@ -68,6 +58,16 @@
     <para>Install the package:</para>
 
     <screen><userinput>make SBINDIR=/sbin install</userinput></screen>
+    
+    <para>The <command>arpd</command> binary links against the DB libraries
+          that reside in <filename class="directory">/usr</filename> and
+          uses a database in <filename>/var/lib/arpd/arpd.db</filename>. Thus,
+          according to the FHS, it must be
+          in <filename class="directory">/usr/sbin</filename>. Move it there:
+    </para>
+
+    <screen><userinput>mv -v /sbin/arpd /usr/sbin</userinput></screen>
+      
   </sect2>
 
   <sect2 id="contents-iproute2" role="content">
@@ -75,8 +75,9 @@
     <segmentedlist>
       <segtitle>Installed programs</segtitle>
       <seglistitem>
-        <seg>ctstat (link to lnstat), ifcfg, ifstat, ip, lnstat, nstat, routef,
-             routel, rtacct, rtmon, rtpr, rtstat (link to lnstat), ss, and tc.
+        <seg>arpd, ctstat (link to lnstat), ifcfg, ifstat, ip, lnstat, nstat,
+	     routef, routel, rtacct, rtmon, rtpr, rtstat (link to lnstat), ss,
+	     and tc.
         </seg>
       </seglistitem>
     </segmentedlist>
@@ -84,6 +85,20 @@
     <variablelist><bridgehead renderas="sect3">Short Descriptions</bridgehead>
 <?dbfo list-presentation="list"?>
 <?dbhtml list-presentation="table"?>
+      <varlistentry id="arpd">
+        <term>
+          <command>arpd</command>
+        </term>
+        <listitem>
+          <para>Userspace ARP daemon, useful in really large networks, where
+	        the kernelspace ARP implementation is insufficient, or
+	        when setting up a honeypot</para>
+          <indexterm zone="ch-system-iproute2 arpd">
+            <primary sortas="b-arpd">arpd</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="ctstat">
         <term>
           <command>ctstat</command>
@@ -292,7 +307,7 @@
         </term>
         <listitem>
           <para>Traffic Controlling Executable; this is for Quality Of
-Service (QOS) and Class Of Service (COS)
+                Service (QOS) and Class Of Service (COS)
                 implementations
           </para>