From a08896444cac8ccef03f233e1f7bb40c0f849109 Mon Sep 17 00:00:00 2001
From: Matthew Burgess <matthew@linuxfromscratch.org>
Date: Wed, 14 Jul 2004 20:49:05 +0000
Subject: * 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
---
 chapter01/changelog.xml | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'chapter01/changelog.xml')

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>
 
-- 
cgit v1.2.3-54-g00ecf