Updated multi-arch to testing r4493.

git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/multi-arch/BOOK@4495 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

5 files changed, 34 insertions, 10 deletions

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index dbed59aa3..d5f0e3a0f 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -63,6 +63,14 @@ first a summary, then a detailed log.</para>
 </itemizedlist>
 </listitem>
 
+<listitem><para>January 5, 2005 [jeremy]: Minor textual correction in network
+configuration, since iproute will not recognize the old eth0:1 format for
+ip aliasing. Closes bug 1013.</para></listitem>
+
+<listitem><para>January 5, 2005 [jeremy]: Added the --disable-selinux parameter
+to Ch 5 glibc.  Allows building from hosts which use SELinux functionality,
+like Fedora Core 3</para></listitem>
+
 <listitem><para>December 25, 2004 [jeremy]: Added text suggested by MSB,
 closing Bug 943</para></listitem>
 
diff --git a/chapter05/glibc.xml b/chapter05/glibc.xml
index 7dbaae7a7..fd15f2adb 100644
--- a/chapter05/glibc.xml
+++ b/chapter05/glibc.xml
@@ -67,7 +67,8 @@ cd ../glibc-build</userinput></screen>
 <screen><userinput>../glibc-&glibc-version;/configure --prefix=/tools \
     --disable-profile --enable-add-ons \
     --enable-kernel=2.6.0 --with-binutils=/tools/bin \
-    --without-gd --without-cvs --with-headers=/tools/include</userinput></screen>
+    --without-gd --without-cvs --with-headers=/tools/include \
+    --disable-selinux</userinput></screen>
 
 <beginpage/>
 <para>The meaning of the configure options:</para>
@@ -122,6 +123,17 @@ program.</para></listitem>
 installed to the tools directory, so that it knows exactly what features the
 kernel has and can optimize itself accordingly.</para></listitem>
 </varlistentry>
+
+<!-- Edit Me -->
+<varlistentry>
+<term><parameter>--disable-selinux</parameter></term>
+<listitem><para>When building from hosts using SELinux functionality
+(i.e. Fedora Core 3), glibc will try to integrate this functionality into
+itself, but will fail, because we do not have this functionality in the LFS
+tools enviornment.  This option will disable this, allowing glibc to build
+correctly, but will not otherwise affect the build.</para></listitem>
+</varlistentry>
+<!-- -->
 </variablelist>
 
 <beginpage/>
diff --git a/chapter07/network.xml b/chapter07/network.xml
index 83c7b7fb3..7789448fc 100644
--- a/chapter07/network.xml
+++ b/chapter07/network.xml
@@ -23,12 +23,16 @@ class="directory">/etc/rc.d/rc*.d</filename>).</para>
 <sect2>
 <title>Creating Network Interface Configuration Files</title>
 
+<!-- Edit Me -->
 <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>
+depends on the files and directories in the <filename
+class="directory">/etc/sysconfig/network-devices</filename> hierarchy.
+This directory should contain a directory for each interface to be configured,
+such as <filename>ifconfig.xyz</filename>, where <quote>xyz</quote> is a
+network interface name. Inside this directory would be files defining
+the attributes to this interface, such as its IP address(es), subnet
+masks, and so forth.</para>
+<!-- -->
 
 <para>If the <filename
 class="directory">/etc/sysconfig/network-devices</filename> directory
diff --git a/general.ent b/general.ent
index 56540b253..3c8930a37 100644
--- a/general.ent
+++ b/general.ent
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!ENTITY version "6.1-testing-20042125">
+<!ENTITY version "6.1-testing-20050105">
 <!ENTITY version-x86 "&version;-x86">
 <!ENTITY version-raq2 "&version;-RaQ2">
 <!ENTITY version-ppc "&version;-PowerPC">
-<!ENTITY releasedate "December 25, 2004">
+<!ENTITY releasedate "January 5, 2005">
 <!ENTITY milestone "6.1">
 
 <!ENTITY lfs-root "http://www.linuxfromscratch.org/">
diff --git a/prologue/bookinfo.xml b/prologue/bookinfo.xml
index 994347c3a..9db4f75f5 100644
--- a/prologue/bookinfo.xml
+++ b/prologue/bookinfo.xml
@@ -16,12 +16,12 @@
 
 
 <copyright id="copyright">
-	<year>1999&ndash;2004</year>
+	<year>1999&ndash;2005</year>
 	<holder>Gerard Beekmans</holder>
 </copyright>
 
 <legalnotice>
-<para>Copyright (c) 1999&ndash;2004, Gerard Beekmans</para>
+<para>Copyright (c) 1999&ndash;2005, Gerard Beekmans</para>
 
 <para>All rights reserved.</para>