From f158011e9c3c9e2667eeacbc1e51feb02927d8b1 Mon Sep 17 00:00:00 2001
From: Bruce Dubbs <bdubbs@linuxfromscratch.org>
Date: Mon, 20 Feb 2012 02:08:13 +0000
Subject: Add sed to the m4 package to fix a false test failure. Update mountfs
 script to support LVM volumes when stopping.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9748 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 bootscripts/lfs/init.d/mountfs |  4 +++-
 chapter01/changelog.xml        | 14 ++++++++++++++
 chapter06/m4.xml               |  6 ++++--
 general.ent                    |  4 ++--
 packages.ent                   |  2 +-
 5 files changed, 24 insertions(+), 6 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/chapter01/changelog.xml b/chapter01/changelog.xml
index 59ffb66a5..2f237de57 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -37,6 +37,20 @@
 
 -->
 
+    <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>
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..05c5afadc 100644
--- a/general.ent
+++ b/general.ent
@@ -1,5 +1,5 @@
-<!ENTITY version "SVN-20120215">
-<!ENTITY releasedate "Feb 15, 2012">
+<!ENTITY version "SVN-20120219">
+<!ENTITY releasedate "Feb 19, 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}]" -->
diff --git a/packages.ent b/packages.ent
index 4a14c75a2..f6f94ba28 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 "20120219">                 <!-- 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 -->
-- 
cgit v1.2.3-54-g00ecf