LFS-7.1

git-svn-id: http://svn.linuxfromscratch.org/LFS/tags/7.1@9758 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

13 files changed, 122 insertions, 25 deletions

diff --git a/bootscripts/lfs/init.d/mountfs b/bootscripts/lfs/init.d/mountfs
index 74e87baff..40a69eefa 100644
--- a/bootscripts/lfs/init.d/mountfs
+++ b/bootscripts/lfs/init.d/mountfs
@@ -64,7 +64,9 @@ case "${1}" in
       log_info_msg "Unmounting all other currently mounted file systems..."
       umount -a -d -r -t notmpfs,nosysfs,nodevtmpfs >/dev/null
       evaluate_retval
-      exit 0
+
+      # Make all LVM volume groups unavailable, if appropriate
+      if [ -x /sbin/vgchange ]; then /sbin/vgchange -an; fi
       ;;
 
    *)
diff --git a/bootscripts/lfs/sbin/ifup b/bootscripts/lfs/sbin/ifup
index 744b4cea2..2facbe8be 100755
--- a/bootscripts/lfs/sbin/ifup
+++ b/bootscripts/lfs/sbin/ifup
@@ -58,27 +58,27 @@ file=/etc/sysconfig/ifconfig.${1}
 log_info_msg "Bringing up the ${1} interface... "
 
 if [ ! -r "${file}" ]; then
-   log_warning_msg "\n${file} is missing or cannot be accessed." 
+   log_failure_msg2 "${file} is missing or cannot be accessed." 
    exit 1
 fi
 
 . $file
 
 if [ "$IFACE" = "" ]; then
-   log_failure_msg "\n${file} does not define an interface [IFACE]."
+   log_failure_msg2 "${file} does not define an interface [IFACE]."
    exit 1
 fi
 
 # Do not process this service if started by boot, and ONBOOT
 # is not set to yes
 if [ "${IN_BOOT}" = "1" -a "${ONBOOT}" != "yes" ]; then
-   log_info_msg2 "skipped\n"
+   log_info_msg2 "skipped"
    exit 0
 fi
 
 for S in ${SERVICE}; do
   if [ ! -x "/lib/services/${S}" ]; then
-    MSG="\nUnable to process ${file}.  Either " 
+    MSG="\n     Unable to process ${file}.  Either " 
     MSG="${MSG}the SERVICE '${S} was not present "
     MSG="${MSG}or cannot be executed."
     log_failure_msg "$MSG"
@@ -102,11 +102,20 @@ if [ -z "${CHECK_LINK}"         -o \
       fi
 
    else
-      log_warning_msg "\nInterface ${IFACE} doesn't exist."
-      exit 0
+      log_failure_msg2 "Interface ${IFACE} doesn't exist."
+      exit 1
    fi
 fi
 
+# Set MTU if requested. Check if MTU has a "good" value.
+if test -n "${MTU}"; then
+   if [[ ${MTU} =~ ^[0-9]+$ ]] && [[ $MTU -ge 68 ]] ; then
+      ip link set dev ${IFACE} mtu $MTU
+   else
+      log_info_msg2 "Invalid MTU $MTU"
+   fi
+fi 
+
 for S in ${SERVICE}; do 
   IFCONFIG=${file} /lib/services/${S} ${IFACE} up
 done
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 59ffb66a5..ec0a19da1 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -38,6 +38,67 @@
 -->
 
     <listitem>
+      <para>2012-03-02</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - LFS-7.1 released.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2012-02-24</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Minor changes to ifup boot script.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2012-02-24</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Add a patch for glibc that fixes a problem
+          (segfault) for dlopen() in some cases.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2012-02-23</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Add a note in section about partitioning using
+          advanced techniques (e.g. RAID and LVM).</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2012-02-20</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - LFS-7.1-rc1 released.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2012-02-19</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Add sed to the m4 package to fix a false test
+          error.  Fixes <ulink url="&lfs-ticket-root;3022">#3022</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update mountfs script to support LVM volumes when
+          stopping.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>2012-02-15</para>
       <itemizedlist>
         <listitem>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index 0ab59263f..a67293735 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -220,6 +220,10 @@
     <title>Added:</title>
 
     <listitem>
+      <para>&glibc-sort-patch;</para>
+    </listitem>
+
+    <listitem>
       <para>Kmod-&kmod-version;</para>
     </listitem>
 
diff --git a/chapter02/creatingpartition.xml b/chapter02/creatingpartition.xml
index 6ccf0aa4b..d235a8bdc 100644
--- a/chapter02/creatingpartition.xml
+++ b/chapter02/creatingpartition.xml
@@ -57,6 +57,15 @@
   refer to <filename>cfdisk(8)</filename> or <filename>fdisk(8)</filename> if
   you do not yet know how to use the programs.</para>
 
+  <note><para>For experienced users, other partitioning schemes are possible.
+  The new LFS system can be on a software <ulink
+  url="&blfs-root;/view/svn/postlfs/raid.html">RAID</ulink> array or an <ulink
+  url="&blfs-root;/view/svn/postlfs/aboutlvm.html">LVM</ulink> logical volume.
+  However, some of these options require an <ulink
+  url="&blfs-root;/view/svn/postlfs/initramfs.html">initramfs</ulink>, which is
+  an advanced topic.  These partitioning methodologies are not recommended for
+  first time LFS users.</para></note>
+
   <para>Remember the designation of the new partition (e.g., <filename
   class="devicefile">hda5</filename>). This book will refer to this as
   the LFS partition. Also remember the designation of the <systemitem
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 051d0129a..5d1db169a 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -83,6 +83,14 @@
     </varlistentry>
 
     <varlistentry>
+      <term>Glibc Bug Sort Relocatable Objects Patch - <token>&glibc-sort-patch-size;</token>:</term>
+      <listitem>
+        <para>Download: <ulink url="&patches-root;&glibc-sort-patch;"/></para>
+        <para>MD5 sum: <literal>&glibc-sort-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
       <term>Glibc GCC Build Fix Patch - <token>&glibc-gcc_fix-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink url="&patches-root;&glibc-gcc_fix-patch;"/></para>
diff --git a/chapter06/glibc.xml b/chapter06/glibc.xml
index 33beee5bf..37ec19105 100644
--- a/chapter06/glibc.xml
+++ b/chapter06/glibc.xml
@@ -102,7 +102,8 @@ unset DL</userinput></screen>
 
     <para>Fix a couple of bugs in Glibc that can cause crashes and core dumps:</para>
 
-<screen><userinput remap="pre">patch -Np1 -i ../&glibc-fixes-patch;</userinput></screen>
+<screen><userinput remap="pre">patch -Np1 -i ../&glibc-fixes-patch;
+patch -Np1 -i ../&glibc-sort-patch;</userinput></screen>
 
     <para>Fix a bug that prevents Glibc from building with GCC-&gcc-version;:</para>
 
diff --git a/chapter06/m4.xml b/chapter06/m4.xml
index c22282c1d..fcbb8f672 100644
--- a/chapter06/m4.xml
+++ b/chapter06/m4.xml
@@ -48,9 +48,11 @@
 
 <screen><userinput remap="make">make</userinput></screen>
 
-    <para>To test the results, issue:</para>
+    <!--<para>To test the results, issue:</para>-->
+    <para>To test the results, first fix a test program and then run the test programs:</para>
 
-<screen><userinput remap="test">make check</userinput></screen>
+<screen><userinput remap="test">sed -i -e '41s/ENOENT/&amp; || errno == EINVAL/' tests/test-readlink.h
+make check</userinput></screen>
 
     <para>Install the package:</para>
 
diff --git a/general.ent b/general.ent
index d26a776d9..cc314583c 100644
--- a/general.ent
+++ b/general.ent
@@ -1,8 +1,8 @@
-<!ENTITY version "SVN-20120215">
-<!ENTITY releasedate "Feb 15, 2012">
+<!ENTITY version "7.1">
+<!ENTITY releasedate "Mar 2, 2012">
 <!ENTITY copyrightdate "1999-2012"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone "7.1">
-<!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->
+<!ENTITY generic-version "7.1"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->
 
 <!ENTITY lfs-root "http://www.linuxfromscratch.org/">
 <!ENTITY lfs-ticket-root "http://wiki.linuxfromscratch.org/lfs/ticket/">
diff --git a/packages.ent b/packages.ent
index 4a14c75a2..450105b0c 100644
--- a/packages.ent
+++ b/packages.ent
@@ -305,7 +305,7 @@
 <!ENTITY less-ch6-du "3.5 MB">
 <!ENTITY less-ch6-sbu "less than 0.1 SBU">
 
-<!ENTITY lfs-bootscripts-version "20120215">                 <!-- Scripts depend on this format -->
+<!ENTITY lfs-bootscripts-version "20120229">                 <!-- Scripts depend on this format -->
 <!ENTITY lfs-bootscripts-size "BOOTSCRIPTS-SIZE KB">         <!-- Updated in Makefile -->
 <!ENTITY lfs-bootscripts-url "&downloads-root;lfs-bootscripts-&lfs-bootscripts-version;.tar.bz2">
 <!ENTITY lfs-bootscripts-md5 "BOOTSCRIPTS-MD5SUM">           <!-- Updated in Makefile -->
@@ -535,7 +535,7 @@
 
 <!ENTITY util-linux-version "2.20.1">
 <!ENTITY util-linux-size "4,506 KB">
-<!ENTITY util-linux-url "ftp://ftp.infradead.org/pub/util-linux/v2.20/util-linux-&util-linux-version;.tar.bz2">
+<!ENTITY util-linux-url "&kernel;linux/utils/util-linux/v2.20/util-linux-&util-linux-version;.tar.bz2">
 <!ENTITY util-linux-md5 "079b37517fd4e002a2e6e992e8b4e361">
 <!ENTITY util-linux-home "http://userweb.kernel.org/~kzak/util-linux/">
 <!--<!ENTITY util-linux-ch5-du "19 MB">-->
diff --git a/patches.ent b/patches.ent
index 3cfc4eee6..ec40be708 100644
--- a/patches.ent
+++ b/patches.ent
@@ -51,6 +51,10 @@
 <!ENTITY glibc-cpuid-patch-md5 "4f110dc9c8d4754fbda841492ce796b4">
 <!ENTITY glibc-cpuid-patch-size "0.8 KB">
 
+<!ENTITY glibc-sort-patch "glibc-&glibc-version;-sort-1.patch">
+<!ENTITY glibc-sort-patch-md5 "740e71017059a4290761db0cc9dd63f3">
+<!ENTITY glibc-sort-patch-size "8.0 KB">
+
 
 <!ENTITY grub-inode-patch "grub-&grub-version;-256byte_inode-1.patch">
 <!ENTITY grub-inode-patch-md5 "2482bef9c1866b4045767a56268ba673">
diff --git a/prologue/hostreqs.xml b/prologue/hostreqs.xml
index 5961b773a..cf7c711e0 100644
--- a/prologue/hostreqs.xml
+++ b/prologue/hostreqs.xml
@@ -146,18 +146,16 @@
   <para id="version-check">To see whether your host system has all the appropriate versions, and
   the ability to compile programs, run the following:</para>
 
-<!--<anchor xreflabel="Version Check Script" id="version-check"/>-->
+<!-- ANY additional lines in the script cause a pdf rendering problem-->
 <screen role="nodump"><userinput>cat &gt; version-check.sh &lt;&lt; "EOF"
 <literal>#!/bin/bash
-export LC_ALL=C
-
 # Simple script to list version numbers of critical development tools
 
+export LC_ALL=C
 bash --version | head -n1 | cut -d" " -f2-4
 echo "/bin/sh -&gt; `readlink -f /bin/sh`"
 echo -n "Binutils: "; ld --version | head -n1 | cut -d" " -f3-
 bison --version | head -n1
-
 if [ -e /usr/bin/yacc ];
   then echo "/usr/bin/yacc -&gt; `readlink -f /usr/bin/yacc`"; 
   else echo "yacc not found"; fi
@@ -167,7 +165,6 @@ echo -n "Coreutils: "; chown --version | head -n1 | cut -d")" -f2
 diff --version | head -n1
 find --version | head -n1
 gawk --version | head -n1
-
 if [ -e /usr/bin/awk ];
   then echo "/usr/bin/awk -&gt; `readlink -f /usr/bin/awk`"; 
   else echo "awk not found"; fi
@@ -187,10 +184,10 @@ echo "Texinfo: `makeinfo --version | head -n1`"
 xz --version | head -n1
 
 echo 'main(){}' &gt; dummy.c &amp;&amp; gcc -o dummy dummy.c
-if [ -x dummy ]; then echo "gcc compilation OK";
+if [ -x dummy ] 
+  then echo "gcc compilation OK";
   else echo "gcc compilation failed"; fi
-rm -f dummy.c dummy
-</literal>
+rm -f dummy.c dummy</literal>
 EOF
 
 bash version-check.sh</userinput></screen>
diff --git a/prologue/why.xml b/prologue/why.xml
index d603fba62..9de025bc0 100644
--- a/prologue/why.xml
+++ b/prologue/why.xml
@@ -327,7 +327,7 @@
         by the <application>diff</application> program.  It is needed by
         the build procedure for several LFS packages.</para>
       </listitem>
-
+<!--
       <listitem>
         <para>PCRE</para>
 
@@ -336,7 +336,7 @@
         as Perl 5.  It is a mandatory dependency of Glib, and can also be used
         by Grep.</para>
       </listitem>
-
+-->
       <listitem>
         <para>Perl</para>