From e787b1fe1487300d51ec7be69d3f98957c137453 Mon Sep 17 00:00:00 2001
From: Bruce Dubbs <bdubbs@linuxfromscratch.org>
Date: Fri, 27 May 2016 19:55:47 +0000
Subject: Update to dbus-1.10.8. Update to e2fsprogs-1.43. Update to gdbm-1.12.
 Update to iproute2-4.6.0. Update to make-4.2. Update to systemd-230.

Add additional explanatory text for sytemctl and journalctl commands.
[chapter07/systemd-custom.xml]



git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/merge@11078 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter08/grub.xml   | 16 +++++++++++++++-
 chapter08/kernel.xml | 12 ++++++++----
 2 files changed, 23 insertions(+), 5 deletions(-)

(limited to 'chapter08')

diff --git a/chapter08/grub.xml b/chapter08/grub.xml
index a8e484bd8..71d1d4c23 100644
--- a/chapter08/grub.xml
+++ b/chapter08/grub.xml
@@ -128,7 +128,7 @@ xorriso -as cdrecord -v dev=/dev/cdrw blank=as_needed grub-img.iso</userinput></
 
     <para>Generate <filename>/boot/grub/grub.cfg</filename>:</para>
 
-    <screen><userinput>cat &gt; /boot/grub/grub.cfg &lt;&lt; "EOF"
+    <screen revision="sysv"><userinput>cat &gt; /boot/grub/grub.cfg &lt;&lt; "EOF"
 <literal># Begin /boot/grub/grub.cfg
 set default=0
 set timeout=5
@@ -141,6 +141,20 @@ menuentry "GNU/Linux, Linux &linux-version;-lfs-&version;" {
 }</literal>
 EOF</userinput></screen>
 
+    <screen revision="systemd"><userinput>cat &gt; /boot/grub/grub.cfg &lt;&lt; "EOF"
+<literal># Begin /boot/grub/grub.cfg
+set default=0
+set timeout=5
+
+insmod ext2
+set root=(hd0,2)
+
+menuentry "GNU/Linux, Linux &linux-version;-lfs-&versiond;" {
+        linux   /boot/vmlinuz-&linux-version;-lfs-&versiond; root=/dev/sda2 ro
+}</literal>
+EOF</userinput></screen>
+
+
     <note><para>From <application>GRUB</application>'s perspective, the
     kernel files are relative to the partition used.  If you
     used a separate /boot partition, remove /boot from the above
diff --git a/chapter08/kernel.xml b/chapter08/kernel.xml
index d955625d7..75f9f63f7 100644
--- a/chapter08/kernel.xml
+++ b/chapter08/kernel.xml
@@ -209,7 +209,9 @@ File systems  ---&gt;
     the automatic setup of the boot process described in the next section.  The
     following command assumes an x86 architecture:</para>
 
-<screen><userinput remap="install">cp -v arch/x86/boot/bzImage /boot/vmlinuz-&linux-version;-lfs-&version;</userinput></screen>
+<screen revision="sysv"><userinput remap="install">cp -v arch/x86/boot/bzImage /boot/vmlinuz-&linux-version;-lfs-&version;</userinput></screen>
+
+<screen revision="systemd"><userinput remap="install">cp -v arch/x86/boot/bzImage /boot/vmlinuz-&linux-version;-lfs-&versiond;</userinput></screen>
 
     <para><filename>System.map</filename> is a symbol file for the kernel.
     It maps the function entry points of every function in the kernel API,
@@ -318,8 +320,9 @@ EOF</userinput></screen>
 
       <seglistitem>
         <seg>config-&linux-version;,
-        vmlinuz-&linux-version;-lfs-&version;, and
-        System.map-&linux-version;</seg>
+        <phrase revision="sysv">vmlinuz-&linux-version;-lfs-&version;,</phrase>
+        <phrase revision="systemd">vmlinuz-&linux-version;-lfs-&versiond;,</phrase>
+        and System.map-&linux-version;</seg>
         <seg>/lib/modules, /usr/share/doc/linux-&linux-version;</seg>
       </seglistitem>
     </segmentedlist>
@@ -340,7 +343,8 @@ EOF</userinput></screen>
       </varlistentry>
 
       <varlistentry id="lfskernel">
-        <term><filename>vmlinuz-&linux-version;-lfs-&version;</filename></term>
+        <term revision="sysv"><filename>vmlinuz-&linux-version;-lfs-&version;</filename></term>
+        <term revision="systemd"><filename>vmlinuz-&linux-version;-lfs-&versiond;</filename></term>
         <listitem>
           <para>The engine of the Linux system. When turning on the computer,
           the kernel is the first part of the operating system that gets loaded.
-- 
cgit v1.2.3-54-g00ecf