Change stripping in Chapter 6 to not require logout.

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

4 files changed, 30 insertions, 12 deletions

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 0f4099ac8..90862e6b4 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -44,6 +44,16 @@
 -->
 
     <listitem>
+      <para>2018-05-07</para>
+      <itemizedlist>
+        <listitem>
+           <para>[bdubbs] - Change stripping in Chapter 6 to not
+           require logout.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>2018-05-05</para>
       <itemizedlist>
         <listitem>
diff --git a/chapter06/revisedchroot.xml b/chapter06/revisedchroot.xml
index 8436600f0..10e68daea 100644
--- a/chapter06/revisedchroot.xml
+++ b/chapter06/revisedchroot.xml
@@ -14,18 +14,21 @@
 
 <screen><userinput>rm -rf /tmp/*</userinput></screen>
 
-  <para>From now on, when reentering the chroot environment after
-  exiting, use the following modified chroot command:</para>
+  <para>Now log out and reenter the chroot environment with an updated
+  chroot command.  From now on, use this updated chroot command any time 
+  you need to reenter the chroot environment after exiting:</para>
 
-<screen role="nodump"><userinput>chroot "$LFS" /usr/bin/env -i          \
+<screen role="nodump"><userinput>logout
+
+chroot "$LFS" /usr/bin/env -i          \
     HOME=/root TERM="$TERM"            \
     PS1='(lfs chroot) \u:\w\$ '        \
     PATH=/bin:/usr/bin:/sbin:/usr/sbin \
     /bin/bash --login</userinput></screen>
 
   <para>The reason for this is that the programs in <filename
-  class="directory">/tools</filename> are no longer needed.  Since they are no
-  longer needed you can delete the <filename class="directory">/tools</filename>
+  class="directory">/tools</filename> are no longer needed.  For this reason
+  you can delete the <filename class="directory">/tools</filename>
   directory if so desired.</para>
 
   <note>
@@ -52,7 +55,6 @@ rm -f /usr/lib/libbz2.a
 rm -f /usr/lib/lib{com_err,e2p,ext2fs,ss}.a
 rm -f /usr/lib/libltdl.a
 rm -f /usr/lib/libfl.a
-rm -f /usr/lib/libfl_pic.a
 rm -f /usr/lib/libz.a</userinput></screen>
 
   <para>There are also several files installed in the /usr/lib and /usr/libexec
diff --git a/chapter06/strippingagain.xml b/chapter06/strippingagain.xml
index 821ac8315..f9cb7b5f4 100644
--- a/chapter06/strippingagain.xml
+++ b/chapter06/strippingagain.xml
@@ -58,9 +58,15 @@ done
 unset LIB save_lib save_usrlib</userinput></screen>
 
   <para>Before performing the stripping, take special care to ensure that
-  none of the binaries that are about to be stripped are running. If
+  none of the binaries that are about to be stripped are running:</para>
+
+<screen role="nodump"><userinput>exec /tools/bin/bash</userinput></screen>
+  
+  <!--
+  If
   unsure whether the user entered chroot with the command given in
-  <xref linkend="ch-system-chroot" role=","/> first exit from
+  <xref linkend="ch-system-chroot" role=","/> first use the version
+  of bash we created in 
   chroot:</para>
 
 <screen role="nodump"><userinput>logout</userinput></screen>
@@ -71,7 +77,7 @@ unset LIB save_lib save_usrlib</userinput></screen>
     HOME=/root TERM=$TERM              \
     PS1='(lfs chroot) \u:\w\$ '        \
     PATH=/bin:/usr/bin:/sbin:/usr/sbin \
-    /tools/bin/bash --login</userinput></screen>
+    /tools/bin/bash - -login</userinput></screen>-->
 
   <para>Now the binaries and libraries can be safely stripped:</para>
 
diff --git a/general.ent b/general.ent
index 044254e51..563d18d9c 100644
--- a/general.ent
+++ b/general.ent
@@ -1,13 +1,13 @@
-<!ENTITY version         "SVN-20180505">
+<!ENTITY version         "SVN-20180507">
 <!ENTITY short-version   "svn">  <!-- Used below in &blfs-book; 
                                       Change to x.y for release but not -rc releases -->
 <!ENTITY generic-version "development"> <!-- Use "development"  or "x.y[-pre{x}]" -->
 
-<!ENTITY versiond        "20180505-systemd">
+<!ENTITY versiond        "20180507-systemd">
 <!ENTITY short-versiond  "systemd">
 <!ENTITY generic-versiond "systemd"> 
 
-<!ENTITY releasedate     "May 5, 2018">
+<!ENTITY releasedate     "May 7, 2018">
 
 <!ENTITY copyrightdate   "1999-2018"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone       "8.3">