From 0f00b7bdb0c5ddc8605a6eb27db0e198e1114437 Mon Sep 17 00:00:00 2001
From: Krejzi <krejzi@linuxfromscratch.org>
Date: Sun, 29 Jun 2014 16:51:08 +0000
Subject: [PATCH] Merge chapter08 changes from trunk.

git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/systemd/BOOK@10607 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 appendices/dependencies.xml |  2 +-
 chapter08/grub.xml          |  4 ++--
 chapter08/kernel.xml        | 48 ++++++++++++++++++++++++++++---------
 3 files changed, 40 insertions(+), 14 deletions(-)

diff --git a/appendices/dependencies.xml b/appendices/dependencies.xml
index 17219181a..7ceacb41f 100644
--- a/appendices/dependencies.xml
+++ b/appendices/dependencies.xml
@@ -2118,7 +2118,7 @@
         </seglistitem>
       </segmentedlist>
 
-<!-- Begin Systemd dependency info -->
+<!-- Begin systemd dependency info -->
   <bridgehead renderas="sect2" id="systemd-dep">Systemd</bridgehead>
 
       <segmentedlist>
diff --git a/chapter08/grub.xml b/chapter08/grub.xml
index 1ff73d777..6d68f8605 100644
--- a/chapter08/grub.xml
+++ b/chapter08/grub.xml
@@ -113,8 +113,8 @@ xorriso -as cdrecord -v dev=/dev/cdrw blank=as_needed grub-img.iso</userinput></
 -->
   </sect2>
 
-  <sect2>
-    <title>Creating the Configuration File</title>
+  <sect2 id="grub-cfg">
+    <title>Creating the GRUB Configuration File</title>
 
     <para>Generate <filename>/boot/grub/grub.cfg</filename>:</para>
 
diff --git a/chapter08/kernel.xml b/chapter08/kernel.xml
index c156b98c6..3e6c0e8c3 100644
--- a/chapter08/kernel.xml
+++ b/chapter08/kernel.xml
@@ -74,28 +74,54 @@
     work correctly or boot at all:</para>
 
     <screen role="nodump">General setup  ---&gt;
-  [*] open by fhandle syscalls
-  [*] Control Group support
+  [*] 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
+  [*] Enable seccomp to safely compute untrusted bytecode [CONFIG_SECCOMP]
 Networking support  ---&gt;
   Networking options  ---&gt;
-    &lt;*&gt; The IPv6 protocol
+    &lt;*&gt; The IPv6 protocol [CONFIG_IPV6]
 Device Drivers  ---&gt;
   Generic Driver Options  ---&gt;
-    ()  path to uevent helper
-    [*] Maintain a devtmpfs filesystem to mount at /dev
-    [ ] Fallback user-helper invocation for firmware loading
+    ()  path to uevent helper [CONFIG_UEVENT_HELPER_PATH]
+    [*] 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
-  &lt;*&gt; Kernel automounter version 4 support (also supports v3)
+  [*] 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
-    [*] Tmpfs extended attributes</screen></note>
+    [*] Tmpfs POSIX Access Control Lists [CONFIG_TMPFS_POSIX_ACL]
+    [*] Tmpfs extended attributes [CONFIG_TMPFS_XATTR]</screen></note>
 
     <note><para>While "The IPv6 Protocol" is not strictly required, it is
     highly recommended by the systemd developers.</para></note>
 
+    <variablelist>
+      <title>The rationale for the above configuration items:</title>
+
+      <varlistentry>
+        <term><parameter>path to uevent helper</parameter></term>
+        <listitem>
+          <para>Having an entry in this space will interfere with device
+          management when using udev/eudev. </para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><parameter>Maintain a devtmpfs</parameter></term>
+        <listitem>
+          <para>This will create automated device nodes which are populated by the
+          kernel, even without udev running.  Udev then runs on top of this,
+          managing permissions and adding symlinks.  This configuration
+          item is required for all users of Udev/Eudev.</para>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
 <screen role="nodump"><userinput>make LANG=<replaceable>&lt;host_LANG_value&gt;</replaceable> LC_ALL= menuconfig</userinput></screen>
 
     <variablelist>