Index: chapter08/coreutils.xml
===================================================================
--- chapter08/coreutils.xml	(revision ba40e325667d24c3988ae5c0395c79a7fe73e6ea)
+++ chapter08/coreutils.xml	(revision 2df066c92495ba027246cfb90e8408943f3fa36a)
@@ -109,5 +109,10 @@
     meant to be run as user <systemitem class="username">root</systemitem>:</para>
 
-<screen><userinput remap="test">make NON_ROOT_USERNAME=tester check-root</userinput></screen>
+    <!-- CLFS note: "su -c" to set the supplementary group IDs.
+         For a normal LFS build, they are already set by 'login' or 'su'.
+         But for CLFS there is no such tool available at the beginning of
+         chapter 7.  Currently coreutils is the only package of which the
+         test suite needs the supplementary GIDs set up.  -->
+<screen><userinput remap="test">su -c 'make NON_ROOT_USERNAME=tester check-root'</userinput></screen>
 
     <para>We're going to run the remainder of the tests as the
Index: chapter08/expect.xml
===================================================================
--- chapter08/expect.xml	(revision ba40e325667d24c3988ae5c0395c79a7fe73e6ea)
+++ chapter08/expect.xml	(revision 2df066c92495ba027246cfb90e8408943f3fa36a)
@@ -97,9 +97,8 @@
     you've not mounted the
     <systemitem class="filesystem">devpts</systemitem> file system
-    correctly.  You need to exit from the chroot environment, read
-    <xref linkend='ch-tools-kernfs'/> again, and ensure the
+    correctly.  You need to read
+    <xref linkend='ch-tools-kernfs'/> again and ensure the
     <systemitem class="filesystem">devpts</systemitem> file system (and
-    other virtual kernel file systems) mounted correctly.  Then reenter
-    the chroot environment following <xref linkend='ch-tools-chroot'/>.
+    other virtual kernel file systems) mounted correctly.
     This issue needs to be resolved before continuing.</para>
 
Index: chapter08/gcc.xml
===================================================================
--- chapter08/gcc.xml	(revision ba40e325667d24c3988ae5c0395c79a7fe73e6ea)
+++ chapter08/gcc.xml	(revision 2df066c92495ba027246cfb90e8408943f3fa36a)
@@ -55,13 +55,12 @@
     <screen><userinput remap="pre">patch -Np1 -i ../&gcc-upstream-fixes-patch;</userinput></screen>
 -->
-    <para>If building on x86_64, change the default directory name for 64-bit
-    libraries to <quote>lib</quote>:</para>
-
-<screen><userinput remap="pre">case $(uname -m) in
-  x86_64)
-    sed -e '/m64=/s/lib64/lib/' \
-        -i.orig gcc/config/i386/t-linux64
-  ;;
-esac</userinput></screen>
+
+    <para>For x86_64 target, set the default directory name for
+    64-bit libraries to <quote>lib</quote>.  The command is unnecessary,
+    but harmless for 32-bit x86.  If you are building for another target,
+    you may need to adjust the command for your target.</para>
+
+<screen><userinput remap="pre">sed -e '/m64=/s/lib64/lib/' \
+    -i.orig gcc/config/i386/t-linux64</userinput></screen>
 
     <para>The GCC documentation recommends building GCC in a dedicated build directory:</para>
Index: chapter08/glibc.xml
===================================================================
--- chapter08/glibc.xml	(revision ba40e325667d24c3988ae5c0395c79a7fe73e6ea)
+++ chapter08/glibc.xml	(revision 2df066c92495ba027246cfb90e8408943f3fa36a)
@@ -72,5 +72,5 @@
 <screen><userinput remap="configure">../configure --prefix=/usr                            \
              --disable-werror                         \
-             --enable-kernel=&min-kernel;                     \
+             --enable-kernel=&linux-major-version;.&linux-minor-version;                      \
              --enable-stack-protector=strong          \
              --with-headers=/usr/include              \
@@ -89,8 +89,9 @@
 
       <varlistentry>
-        <term><parameter>--enable-kernel=&min-kernel;</parameter></term>
+        <term><parameter>--enable-kernel=&linux-major-version;.&linux-minor-version;</parameter></term>
         <listitem>
           <para>This option tells the build system that this Glibc may
-          be used with kernels as old as &min-kernel;. This means generating
+          be used with kernels as old as
+          &linux-major-version;.&linux-minor-version;. This means generating
           workarounds in case a system call introduced in a later version
           cannot be used.</para>
