* Merged recent testing changes back up to unstable (bootscripts & iproute2)

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

8 files changed, 282 insertions, 214 deletions

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index bf3773ab2..fe40c9e28 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -47,6 +47,8 @@ first a summary, then a detailed log.</para>
 <listitem><para>hotplug-2004_04_01-device-2.patch</para></listitem>
 <listitem><para>hotplug-2004_04_01-isapnp-2.patch</para></listitem>
 <listitem><para>inetutils-1.4.2-kernel_headers-1.patch</para></listitem>
+<listitem><para>iproute2-2.6.X-ss040702</para></listitem>
+<listitem><para>iproute2-2.6.X-ss040702-remove_db-1.patch</para></listitem>
 <listitem><para>linux-libc-headers-2.6.7.0</para></listitem>
 <listitem><para>module-init-tools-3.0</para></listitem>
 <listitem><para>net-tools-1.60-gcc34-3.patch</para></listitem>
@@ -71,11 +73,18 @@ first a summary, then a detailed log.</para>
 <listitem><para>gcc-2.95.3</para></listitem>
 <listitem><para>kbd-1.12-more-programs-1.patch</para></listitem>
 <listitem><para>modutils-2.4.25</para></listitem>
+<listitem><para>net-tools-1.60</para></listitem>
 <listitem><para>net-tools-1.60-miitool-gcc33-1.patch</para></listitem>
 <listitem><para>procinfo-18</para></listitem>
 </itemizedlist>
 </listitem>
 
+<listitem><para>July 14, 2004 [matt]: Upgraded to lfs-bootscripts-2.2.0.</para>
+</listitem>
+
+<listitem><para>July 14, 2004 [matt]: Swapped iproute2 in for net-tools (kudos
+and many thanks to Jim Gifford)</para></listitem>
+
 <listitem><para>July 14, 2004 [matt]: chapter06/udev.xml - Explained udevdir
 option</para></listitem>
 
diff --git a/chapter03/packages.xml b/chapter03/packages.xml
index 9042a14ab..ef15bcaf6 100644
--- a/chapter03/packages.xml
+++ b/chapter03/packages.xml
@@ -187,6 +187,13 @@
 </varlistentry>
 
 <varlistentry>
+<term>IPRoute2 (&iproute2-version;) - 230 KB:</term>
+<listitem>
+<para><ulink url="http://developer.osdl.org/dev/iproute2/download/"/></para>
+</listitem>
+</varlistentry>
+
+<varlistentry>
 <term>Kbd (&kbd-version;) - 617 KB:</term>
 <listitem>
 <para><ulink url="&freshmeat;kbd/"/></para>
@@ -278,13 +285,6 @@
 </varlistentry>
 
 <varlistentry>
-<term>Net-tools (&net-tools-version;) - 194 KB:</term>
-<listitem>
-<para><ulink url="&freshmeat;net-tools/"/></para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
 <term>Patch (&patch-version;) - 182 KB:</term>
 <listitem>
 <para><ulink url="&freshmeat;patch/"/></para>
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 926ebae8f..a3779eed5 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -24,7 +24,7 @@ following:</para>
 <varlistentry>
 <term>Coreutils Suppress Hostname, Uptime, Kill, Su Patch - 16 KB:</term>
 <listitem>
-<para><ulink url="&patches-root;coreutils-&coreutils-version;-suppress_hostname_uptime_kill_su-1.patch"/></para>
+<para><ulink url="&patches-root;coreutils-&coreutils-version;-suppress_uptime_kill_su-1.patch"/></para>
 </listitem>
 </varlistentry>
 
@@ -101,23 +101,23 @@ following:</para>
 </varlistentry>
 
 <varlistentry>
-<term>Man 80-Columns Patch - 1 KB:</term>
+<term>IPRoute2 Disable DB Patch - 1 KB:</term>
 <listitem>
-<para><ulink url="&patches-root;man-&man-version;-80cols-1.patch"/></para>
+<para><ulink url="&patches-root;iproute2-&iproute2-version;-remove_db-1.patch"/></para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term>Mktemp Tempfile Patch - 3 KB:</term>
+<term>Man 80-Columns Patch - 1 KB:</term>
 <listitem>
-<para><ulink url="&patches-root;mktemp-&mktemp-version;-add_tempfile-1.patch"/></para>
+<para><ulink url="&patches-root;man-&man-version;-80cols-1.patch"/></para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term>Net-tools GCC 3.4 Compatibility Patch - 3 KB:</term>
+<term>Mktemp Tempfile Patch - 3 KB:</term>
 <listitem>
-<para><ulink url="&patches-root;net-tools-&net-tools-version;-gcc34-3.patch"/></para>
+<para><ulink url="&patches-root;mktemp-&mktemp-version;-add_tempfile-1.patch"/></para>
 </listitem>
 </varlistentry>
 
diff --git a/chapter06/chapter06.xml b/chapter06/chapter06.xml
index 603568982..6ae2b15e2 100644
--- a/chapter06/chapter06.xml
+++ b/chapter06/chapter06.xml
@@ -38,8 +38,8 @@
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sed.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="flex.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gettext.xml"/>
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="net-tools.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="inetutils.xml"/>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="iproute2.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="perl.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="texinfo.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="autoconf.xml"/>
diff --git a/chapter06/iproute2.xml b/chapter06/iproute2.xml
new file mode 100644
index 000000000..0b402bd9b
--- /dev/null
+++ b/chapter06/iproute2.xml
@@ -0,0 +1,241 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../general.ent">
+  %general-entities;
+]>
+<sect1 id="ch-system-iproute2" xreflabel="IProute2" role="wrap">
+  <title>Iproute2-&iproute2-version;</title>
+<?dbhtml filename="iproute2.html"?>
+  <indexterm zone="ch-system-iproute2">
+    <primary sortas="a-IProute2">IProute2</primary>
+  </indexterm>
+  <sect2 role="package">
+    <title/>
+    <para>The IPRoute2 package contains programs for basic networking.</para>
+    <segmentedlist>
+      <segtitle>&buildtime;</segtitle>
+      <segtitle>&diskspace;</segtitle>
+      <seglistitem>
+        <seg>0.1 SBU</seg>
+        <seg>.6 MB</seg>
+      </seglistitem>
+    </segmentedlist>
+    <segmentedlist>
+      <segtitle>IPRoute2 installation depends on</segtitle>
+      <seglistitem>
+        <seg>sed, GCC, Glibc, Make, Linux-Headers</seg>
+      </seglistitem>
+    </segmentedlist>
+  </sect2>
+  <sect2 role="installation">
+    <title>Installation of IProute2</title>
+    <para>The <command>arp</command> binary included in this package is
+          dependent on Berkeley-DB.  As <command>arp</command> is not a very
+          common requirement on a base Linux system we remove the dependency on
+          Berkeley-DB by applying the patch using the command below.  If you
+          need the <command>arp</command> binary, then instructions for
+          compiling Berkeley-DB can be found in the <ulink
+          url="http://www.linuxfromscratch.org/blfs/view/cvs/content/databases.html#db">BLFS book</ulink>.
+    </para>
+
+    <screen><userinput>patch -Np1 -i ../iproute2-&iproute2-version;-remove_db-1.patch</userinput></screen>
+
+    <para>Prepare IProute2 for compilation:</para>
+    <screen> <userinput>./configure </userinput></screen>
+
+    <para>Compile the package:</para>
+
+    <screen><userinput>make</userinput></screen>
+
+    <para>Now install it:</para>
+
+    <screen><userinput>make install</userinput></screen>
+  </sect2>
+
+  <sect2 id="contents-iproute2" role="content">
+    <title>Contents of IPRoute2</title>
+    <segmentedlist>
+      <segtitle>Installed programs</segtitle>
+      <seglistitem>
+        <seg>ifstat, ip, nstat, routef, routel, rtmon, rtstat, ss, and tc.</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <title>Short descriptions</title>
+
+      <varlistentry id="ifstat">
+        <term>
+          <command>ifstat</command>
+        </term>
+        <listitem>
+          <indexterm zone="ch-system-iproute2 ifstat">
+            <primary sortas="b-ifstat">ifstat</primary>
+          </indexterm>
+          <para>shows the interfaces statistics. Shows the amount of transmitted
+                and received packages by interface</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="ip">
+        <term>
+          <command>ip</command>
+        </term>
+        <listitem>
+          <indexterm zone="ch-system-iproute2 ip">
+            <primary sortas="b-ip">ip</primary>
+          </indexterm>
+
+          <para>is the main executable. Has several different functions.</para>
+
+          <para><command>ip link <replaceable>[device]</replaceable></command>
+                allows you to look at the state of devices and to change it.
+          </para>
+
+          <para><command>ip addr</command> allows you to look at addresses and
+                their properties, add new addresses and to delete old ones.
+          </para>
+
+          <para><command>ip neighbor</command> allows you to look at neighbour
+                bindings and their properties, add new neighbour entries and to
+                delete old ones.
+          </para>
+
+          <para><command>ip rule</command> allows you to look at the routing
+                policies and change them.
+          </para>
+
+          <para><command>ip route</command> allows you to look at the routing
+                table and change routing table rules.
+          </para>
+
+          <para><command>ip tunnel</command> allows you to look at the ip
+                tunnels and their properties, and change them.
+          </para>
+
+          <para><command>ip maddr</command> allows you to look at the multicast
+                addresses and their properties, and change them.
+          </para>
+
+          <para><command>ip mroute</command> allows you to set, change, or
+                delete the mutlicast routing.
+          </para>
+
+          <para><command>ip monitor</command> allows you to monitor the state of
+                devices, addresses and routes continuously.
+          </para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="nstat">
+        <term>
+          <command>nstat</command>
+        </term>
+        <listitem>
+          <indexterm zone="ch-system-iproute2 nstat">
+            <primary sortas="b-nstat">nstat</primary>
+          </indexterm>
+          <para>Shows network statistics</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="routef">
+        <term>
+          <command>routef</command>
+        </term>
+        <listitem>
+          <indexterm zone="ch-system-iproute2 routef">
+            <primary sortas="b-routef">routef</primary>
+          </indexterm>
+          <para>A component of ip route. This is for flushing the routing
+                tables.
+          </para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="routel">
+        <term>
+          <command>routel</command>
+        </term>
+        <listitem>
+          <indexterm zone="ch-system-iproute2 routel">
+            <primary sortas="b-routel">routel</primary>
+          </indexterm>
+          <para>A component of ip route. This is for listing the routing
+                tables.
+          </para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="rtmon">
+        <term>
+          <command>rtmon</command>
+        </term>
+        <listitem>
+          <indexterm zone="ch-system-iproute2 rtmon">
+            <primary sortas="b-rtmon">rtmon</primary>
+          </indexterm>
+          <para>Route Monitoring Utility.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="rtstat">
+        <term>
+          <command>rtstat</command>
+        </term>
+        <listitem>
+          <indexterm zone="ch-system-iproute2 rtstat">
+            <primary sortas="b-rtstat">rtstat</primary>
+          </indexterm>
+          <para>Route Status Utility</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="ss">
+        <term>
+          <command>ss</command>
+        </term>
+        <listitem>
+          <indexterm zone="ch-system-iproute2 ss">
+            <primary sortas="b-ss">ss</primary>
+          </indexterm>
+          <para>Similar to the netstat command. Shows active connections.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="tc">
+        <term>
+          <command>tc</command>
+        </term>
+        <listitem>
+          <indexterm zone="ch-system-iproute2 ss">
+            <primary sortas="b-tc">tc</primary>
+          </indexterm>
+          <para>Traffic Controlling Executable. This is for QOS/COS
+                implementations.
+          </para>
+
+          <para><command>tc qdisc</command> allows you to setup the queueing
+                discipline.
+          </para>
+
+          <para><command>tc class</command> allows you to setup classes based on
+                the queuing discipline scheduling.
+          </para>
+
+          <para><command>tc estimator</command> allows you to estimate the
+                network flow into a network.
+          </para>
+
+          <para><command>tc filter</command> allows you to setup the QOS/COS
+                packet filtering.
+          </para>
+
+          <para><command>tc policy</command> allows you to setup the QOS/COS
+                policies.
+          </para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </sect2>
+</sect1>
diff --git a/chapter06/net-tools.xml b/chapter06/net-tools.xml
deleted file mode 100644
index 9f4388b5e..000000000
--- a/chapter06/net-tools.xml
+++ /dev/null
@@ -1,188 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-<sect1 id="ch-system-net-tools" xreflabel="Net-tools" role="wrap">
-<title>Net-tools-&net-tools-version;</title>
-<?dbhtml filename="net-tools.html"?>
-
-<indexterm zone="ch-system-net-tools"><primary sortas="a-Net-tools">Net-tools</primary></indexterm>
-
-<sect2 role="package"><title/>
-<para>The Net-tools package contains programs for basic networking.</para>
-
-<segmentedlist>
-<segtitle>&buildtime;</segtitle>
-<segtitle>&diskspace;</segtitle>
-<seglistitem><seg>0.1 SBU</seg><seg>9.4 MB</seg></seglistitem>
-</segmentedlist>
-
-<segmentedlist>
-<segtitle>Net-tools installation depends on</segtitle>
-<seglistitem><seg>Bash, Binutils, Coreutils, GCC,
-Glibc, Make</seg></seglistitem>
-</segmentedlist>
-</sect2>
-
-<sect2 role="installation">
-<title>Installation of Net-tools</title>
-
-<para>If you don't know what to answer to all the questions asked during the
-<command>make config</command> phase below, then just accept the defaults.
-This will be just fine in the majority of cases. What you're asked here is a
-bunch of questions about which network protocols you've enabled in your
-kernel. The default answers will enable the tools from this package to work
-with the most common protocols: TCP, PPP, and several others. You still need
-to actually enable these protocols in the kernel -- what you do here is merely
-telling the package to include support for those protocols in its programs,
-but it's up to the kernel to make the protocols available.</para>
-
-<para>This package also has issues with being compiled by GCC 3.4, which we
-fix by applying the following patch:</para>
-
-<screen><userinput>patch -Np1 -i ../net-tools-&net-tools-version;-gcc34-3.patch</userinput></screen>
-
-<para>Fix an issue that arises when building against Linux 2.6:</para>
-
-<screen><userinput>sed -i 's@x25_address@struct &amp;@' lib/x25_sr.c</userinput></screen>
-
-<para>Now prepare Net-tools for compilation (if you intend to accept the
-defaults, you can skip all the questions by running <userinput>yes "" |
-make config</userinput> instead):</para>
-
-<screen><userinput>make config</userinput></screen>
-
-<para>Compile the package:</para>
-
-<screen><userinput>make</userinput></screen>
-
-<para>Now install it:</para>
-
-<screen><userinput>make update</userinput></screen>
-
-</sect2>
-
-
-<sect2 id="contents-net" role="content"><title>Contents of Net-tools</title>
-
-<segmentedlist>
-<segtitle>Installed programs</segtitle>
-<seglistitem><seg>arp, dnsdomainname (link to hostname), domainname (link to 
-hostname), hostname, ifconfig, nameif, netstat, nisdomainname (link to hostname), 
-plipconfig, rarp, route, slattach and ypdomainname (link to hostname)</seg></seglistitem>
-</segmentedlist>
-
-<variablelist><title>Short descriptions</title>
-
-<varlistentry id="arp">
-<term><command>arp</command></term>
-<listitem>
-<indexterm zone="ch-system-net-tools arp"><primary sortas="b-arp">arp</primary></indexterm>
-<para>is used to manipulate the kernel's ARP cache,
-usually to add or delete an entry, or to dump the entire cache.</para>
-</listitem>
-</varlistentry>
-
-<varlistentry id="dnsdomainname">
-<term><command>dnsdomainname</command></term>
-<listitem>
-<indexterm zone="ch-system-net-tools dnsdomainname"><primary sortas="b-dnsdomainname">dnsdomainname</primary></indexterm>
-<para>reports the system's DNS (Domain Name Server) domain name.</para>
-</listitem>
-</varlistentry>
-
-<varlistentry id="domainname">
-<term><command>domainname</command></term>
-<listitem>
-<indexterm zone="ch-system-net-tools domainname"><primary sortas="b-domainname">domainname</primary></indexterm>
-<para>reports or sets the system's NIS/YP domain name.</para>
-</listitem>
-</varlistentry>
-
-<varlistentry id="hostname">
-<term><command>hostname</command></term>
-<listitem>
-<indexterm zone="ch-system-net-tools hostname"><primary sortas="b-hostname">hostname</primary></indexterm>
-<para>reports or sets the name of the current host system.</para>
-</listitem>
-</varlistentry>
-
-<varlistentry id="ifconfig">
-<term><command>ifconfig</command></term>
-<listitem>
-<indexterm zone="ch-system-net-tools ifconfig"><primary sortas="b-ifconfig">ifconfig</primary></indexterm>
-<para>is the main utility for configuring network interfaces.</para>
-</listitem>
-</varlistentry>
-
-<varlistentry id="nameif">
-<term><command>nameif</command></term>
-<listitem>
-<indexterm zone="ch-system-net-tools nameif"><primary sortas="b-nameif">nameif</primary></indexterm>
-<para>names network interfaces based on MAC addresses.</para>
-</listitem>
-</varlistentry>
-
-<varlistentry id="netstat">
-<term><command>netstat</command></term>
-<listitem>
-<indexterm zone="ch-system-net-tools netstat"><primary sortas="b-netstat">netstat</primary></indexterm>
-<para>is used to report network connections, routing tables, and interface 
-statistics..</para>
-</listitem>
-</varlistentry>
-
-<varlistentry id="nisdomainname">
-<term><command>nisdomainname</command></term>
-<listitem>
-<indexterm zone="ch-system-net-tools nisdomainname"><primary sortas="b-nisdomainname">nisdomainname</primary></indexterm>
-<para>does the same as <command>domainname</command>.</para>
-</listitem>
-</varlistentry>
-
-<varlistentry id="plipconfig">
-<term><command>plipconfig</command></term>
-<listitem>
-<indexterm zone="ch-system-net-tools plipconfig"><primary sortas="b-plipconfig">plipconfig</primary></indexterm>
-<para>is used to fine tune the PLIP device parameters, to improve its performance.</para>
-</listitem>
-</varlistentry>
-
-<varlistentry id="rarp">
-<term><command>rarp</command></term>
-<listitem>
-<indexterm zone="ch-system-net-tools rarp"><primary sortas="b-rarp">rarp</primary></indexterm>
-<para>is used to manipulate the kernel's RARP table.</para>
-</listitem>
-</varlistentry>
-
-<varlistentry id="route">
-<term><command>route</command></term>
-<listitem>
-<indexterm zone="ch-system-net-tools route"><primary sortas="b-route">route</primary></indexterm>
-<para>is used to manipulate the IP routing table.</para>
-</listitem>
-</varlistentry>
-
-<varlistentry id="slattach">
-<term><command>slattach</command></term>
-<listitem>
-<indexterm zone="ch-system-net-tools slattach"><primary sortas="b-slattach">slattach</primary></indexterm>
-<para>attaches a network interface to a serial line. This allows you to use normal 
-terminal lines for point-to-point links to other computers.</para>
-</listitem>
-</varlistentry>
-
-<varlistentry id="ypdomainname">
-<term><command>ypdomainname</command></term>
-<listitem>
-<indexterm zone="ch-system-net-tools ypdomainname"><primary sortas="b-ypdomainname">ypdomainname</primary></indexterm>
-<para>does the same as <command>domainname</command>.</para>
-</listitem>
-</varlistentry>
-</variablelist>
-
-</sect2>
-
-</sect1>
diff --git a/chapter07/network.xml b/chapter07/network.xml
index 19109c01e..3113aec58 100644
--- a/chapter07/network.xml
+++ b/chapter07/network.xml
@@ -25,22 +25,27 @@ run-level directories
 
 <para>Which interfaces are brought up and down by the network script depends on
 the files in the <filename class="directory">/etc/sysconfig/network-devices</filename> directory. This
-directory should contain files in the form of <filename>ifconfig.xyz</filename>, where <quote>xyz</quote> is a
-network interface name (such as eth0 or eth0:1)</para>
+directory should contain subdirectories in the form of
+<filename>ifconfig.xyz</filename>, where <quote>xyz</quote> is a network
+interface name (such as eth0 or eth0:1)</para>
 
-<para>If you decide to rename or move this <filename class="directory">/etc/sysconfig/network-devices</filename>
-directory, make sure you update the <filename>/etc/sysconfig/rc</filename> file as well and
+<para>If you decide to rename or move this
+<filename class="directory">/etc/sysconfig/network-devices</filename> directory,
+make sure you update the <filename>/etc/sysconfig/rc</filename> file as well and
 update the <quote>network_devices</quote> by providing it with the new path.</para>
 
-<para>Now, new files are created in that directory.
-The following command creates a sample <filename>ifconfig.eth0</filename> file:</para>
+<para>Now, new files are created in that directory.  The following command
+creates a sample <filename>ipv4</filename> file for the
+<filename>eth0</filename> device:</para>
 
-<screen><userinput>cat &gt; /etc/sysconfig/network-devices/ifconfig.eth0 &lt;&lt; "EOF"
+<screen><userinput>cd /etc/sysconfig/network-devices &amp;&amp;
+mkdir ifconfig.eth0 &amp;&amp;
+cat &gt; ifconfig.eth0/ipv4 &lt;&lt; "EOF"
 ONBOOT=yes
-SERVICE=static
+SERVICE=ipv4-static
 IP=192.168.1.1
 GATEWAY=192.168.1.2
-NETMASK=255.255.255.0
+NETMASK=24
 BROADCAST=192.168.1.255
 EOF</userinput></screen>
 
@@ -75,6 +80,7 @@ following:</para>
 <screen><userinput>cat &gt; /etc/resolv.conf &lt;&lt; "EOF"
 # Begin /etc/resolv.conf
 
+domain {<replaceable>[Your Domain Name]</replaceable>}
 nameserver <replaceable>[IP address of your nameserver]</replaceable>
 
 # End /etc/resolv.conf
diff --git a/general.ent b/general.ent
index 832254799..834c66988 100644
--- a/general.ent
+++ b/general.ent
@@ -20,7 +20,7 @@
 <!ENTITY bash-version "2.05b">
 <!ENTITY binutils-version "2.15.91.0.1">
 <!ENTITY bison-version "1.875a">
-<!ENTITY bootscripts-version "2.1.2">
+<!ENTITY bootscripts-version "2.2.0">
 <!ENTITY bzip2-version "1.0.2">
 <!ENTITY coreutils-version "5.2.1">
 <!ENTITY dejagnu-version "1.4.4">
@@ -41,6 +41,7 @@
 <!ENTITY hotplug-version "2004_04_01">
 <!ENTITY iana-etc-version "1.00">
 <!ENTITY inetutils-version "1.4.2">
+<!ENTITY iproute2-version "2.6.X-ss040702">
 <!ENTITY kbd-version "1.12">
 <!ENTITY less-version "382">
 <!ENTITY libtool-version "1.5.6">
@@ -53,7 +54,6 @@
 <!ENTITY mktemp-version "1.5">
 <!ENTITY module-init-tools-version "3.0">
 <!ENTITY ncurses-version "5.4">
-<!ENTITY net-tools-version "1.60">
 <!ENTITY patch-version "2.5.4">
 <!ENTITY perl-version "5.8.4">
 <!ENTITY procps-version "3.2.1">