Create branches/merge in svn repo fo rtesting of merged LFS books

git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/merge@11073 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

3 files changed, 64 insertions, 34 deletions

diff --git a/chapter08/fstab.xml b/chapter08/fstab.xml
index d1be334ee..91ad2dfe0 100644
--- a/chapter08/fstab.xml
+++ b/chapter08/fstab.xml
@@ -19,7 +19,7 @@
   which must be checked (for integrity errors) prior to mounting. Create a new
   file systems table like this:</para>
 
-<screen><userinput>cat &gt; /etc/fstab &lt;&lt; "EOF"
+<screen revision="sysv"><userinput>cat &gt; /etc/fstab &lt;&lt; "EOF"
 <literal># Begin /etc/fstab
 
 # file system  mount-point  type     options             dump  fsck
@@ -36,6 +36,18 @@ devtmpfs       /dev         devtmpfs mode=0755,nosuid    0     0
 # End /etc/fstab</literal>
 EOF</userinput></screen>
 
+<screen revision="systemd"><userinput>cat &gt; /etc/fstab &lt;&lt; "EOF"
+<literal># Begin /etc/fstab
+
+# file system  mount-point  type     options             dump  fsck
+#                                                              order
+
+/dev/<replaceable>&lt;xxx&gt;</replaceable>     /            <replaceable>&lt;fff&gt;</replaceable>    defaults            1     1
+/dev/<replaceable>&lt;yyy&gt;</replaceable>     swap         swap     pri=1               0     0
+
+# End /etc/fstab</literal>
+EOF</userinput></screen>
+
   <para>Replace <replaceable>&lt;xxx&gt;</replaceable>,
   <replaceable>&lt;yyy&gt;</replaceable>, and <replaceable>&lt;fff&gt;</replaceable>
   with the values appropriate for the system, for example, <filename
@@ -44,19 +56,6 @@ EOF</userinput></screen>
   class="filesystem">ext4</systemitem>. For details on the six
   fields in this file, see <command>man 5 fstab</command>.</para>
 
-<!--
-  <para>The <filename class="directory">/dev/shm</filename> mount point
-  for <systemitem class="filesystem">tmpfs</systemitem> is included to
-  allow enabling POSIX-shared memory. The kernel must have the required
-  support built into it for this to work (more about this is in the next
-  section). Please note that very little software currently uses
-  POSIX-shared memory.  Therefore, consider the <filename
-  class="directory">/dev/shm</filename> mount point optional. For more
-  information, see
-  <filename>Documentation/filesystems/tmpfs.txt</filename> in the kernel
-  source tree.</para>
--->
-
   <para>Filesystems with MS-DOS or Windows origin (i.e.: vfat, ntfs, smbfs, cifs,
   iso9660, udf) need the <quote>iocharset</quote> mount option in order for
   non-ASCII characters in file names to be interpreted properly. The value
@@ -96,8 +95,6 @@ EOF</userinput></screen>
   <quote>Default iocharset for FAT</quote> (<option>CONFIG_FAT_DEFAULT_IOCHARSET</option>).
   There is no way to specify these settings for the
   ntfs filesystem at kernel compilation time.</para>
-  <!-- Personally, I find it more foolproof to always specify the iocharset and
-  codepage in /etc/fstab for MS-based filesystems - Alexander E. Patrakov -->
 
   <para>It is possible to make the ext3 filesystem reliable across power
   failures for some hard disk types.  To do this, add the
diff --git a/chapter08/grub.xml b/chapter08/grub.xml
index c0bc1d983..a8e484bd8 100644
--- a/chapter08/grub.xml
+++ b/chapter08/grub.xml
@@ -39,13 +39,13 @@ grub-mkrescue --output=grub-img.iso
 xorriso -as cdrecord -v dev=/dev/cdrw blank=as_needed grub-img.iso</userinput></screen>
 
     <note><para>Most newer systems now come with system firmware that is in
-    UEFI ((Unified Extensible Firmware Interface) mode by default.  To boot LFS
+    UEFI (Unified Extensible Firmware Interface) mode by default. To boot LFS
     on these systems using the instructions here, the UEFI Mode and Secure Boot
-    capabilities need to be turned off.  There are ways to boot with these
-    capabilities still enabled, but are not covered here.  For details, see
-    <ulink
-    url="http://www.linuxfromscratch.org/hints/downloads/files/lfs-uefi.txt">the
-    lfs-uefi.txt hint</ulink> at
+    capabilities need to be turned off. There are ways to boot with these
+    capabilities still enabled, but then are not covered here. For details, 
+    see <ulink
+    url="http://www.linuxfromscratch.org/hints/downloads/files/lfs-uefi.txt"> 
+    the lfs-uefi.txt hint</ulink> at
     http://www.linuxfromscratch.org/hints/downloads/files/lfs-uefi.txt.</para></note>
 
   </sect2>
diff --git a/chapter08/kernel.xml b/chapter08/kernel.xml
index d487327b4..d955625d7 100644
--- a/chapter08/kernel.xml
+++ b/chapter08/kernel.xml
@@ -65,24 +65,57 @@
     information about configuring and building the kernel can be found at
     <ulink url="http://www.kroah.com/lkn/"/> </para>
 
-    <note><para>A good starting place for setting up the kernel configuration
-    is to run <command>make defconfig</command>. This will set the base
-    configuration to a good state that takes your current system architecture
-    into account.</para>
+    <note>
+    
+      <para>A good starting place for setting up the kernel configuration is to
+      run <command>make defconfig</command>. This will set the base
+      configuration to a good state that takes your current system architecture
+      into account.</para>
 
-    <para>Be sure to configure the following features as shown:</para>
+      <para>Be sure to enable or disable following features or the system might
+      not work correctly or boot at all:</para>
 
-        <screen role="nodump">
+      <screen role="nodump" revision="sysv">
 Device Drivers  ---&gt;
   Generic Driver Options  ---&gt;
    [ ] Support for uevent helper [CONFIG_UEVENT_HELPER]
-   [*] Maintain a devtmpfs filesystem to mount at /dev [CONFIG_DEVTMPFS]</screen></note>
+   [*] Maintain a devtmpfs filesystem to mount at /dev [CONFIG_DEVTMPFS]</screen>
+
+      <screen role="nodump" revision="systemd">
+  [*] open by fhandle syscalls [CONFIG_FHANDLE]
+  [ ] Auditing support [CONFIG_AUDIT]
+  [*] Control Group support [CONFIG_CGROUPS]
+Processor type and features  ---&gt;
+  [*] Enable seccomp to safely compute untrusted bytecode [CONFIG_SECCOMP]
+Networking support  ---&gt;
+  Networking options  ---&gt;
+    &lt;*&gt; The IPv6 protocol [CONFIG_IPV6]
+Device Drivers  ---&gt;
+  Generic Driver Options  ---&gt;
+    [ ] Support for uevent helper [CONFIG_UEVENT_HELPER]
+    [*] Maintain a devtmpfs filesystem to mount at /dev [CONFIG_DEVTMPFS]
+    [ ] Fallback user-helper invocation for firmware loading [CONFIG_FW_LOADER_USER_HELPER]
+Firmware Drivers  ---&gt;
+    [*] Export DMI identification via sysfs to userspace [CONFIG_DMIID]
+File systems  ---&gt;
+  [*] Inotify support for userspace [CONFIG_INOTIFY_USER]
+  &lt;*&gt; Kernel automounter version 4 support (also supports v3) [CONFIG_AUTOFS4_FS]
+  Pseudo filesystems  ---&gt;
+    [*] Tmpfs POSIX Access Control Lists [CONFIG_TMPFS_POSIX_ACL]
+    [*] Tmpfs extended attributes [CONFIG_TMPFS_XATTR]</screen>
+
+    </note>
+
+    <note revision="systemd">
+      <para>While "The IPv6 Protocol" is not strictly
+      required, it is highly recommended by the systemd developers.</para>
+    </note>
 
-    <para>There are several other options that may be desired depending
-    on the requirements for the system. For a list of options needed
-    for BLFS packages, see the <ulink 
-    url="&lfs-root;blfs/view/&short-version;/longindex.html#kernel-config-index">BLFS 
-    Index of Kernel Settings</ulink> 
+    <para revision="sysv">There are several other options that may be desired
+    depending on the requirements for the system. For a list of options needed
+    for BLFS packages, see the <ulink
+    url="&lfs-root;blfs/view/&short-version;/longindex.html#kernel-config-index">BLFS
+    Index of Kernel Settings</ulink>
     (&lfs-root;blfs/view/&short-version;/longindex.html#kernel-config-index).</para>
 
     <variablelist>