Changeset e787b1f for chapter08

Timestamp:

05/27/2016 07:55:47 PM (8 years ago)

Author:

Bruce Dubbs <bdubbs@…>

Branches:

10.0, 10.0-rc1, 10.1, 10.1-rc1, 11.0, 11.0-rc1, 11.0-rc2, 11.0-rc3, 11.1, 11.1-rc1, 11.2, 11.2-rc1, 11.3, 11.3-rc1, 12.0, 12.0-rc1, 12.1, 12.1-rc1, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, arm, bdubbs/gcc13, ml-11.0, multilib, renodr/libudev-from-systemd, s6-init, trunk, xry111/arm64, xry111/arm64-12.0, xry111/clfs-ng, xry111/lfs-next, xry111/loongarch, xry111/loongarch-12.0, xry111/loongarch-12.1, xry111/mips64el, xry111/pip3, xry111/rust-wip-20221008, xry111/update-glibc

Children:

1aff37f

Parents:

cbd8bf0f

Message:

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

Location:

chapter08

Files:

• grub.xml (modified) (2 diffs)
• kernel.xml (modified) (3 diffs)

chapter08/grub.xml

@@ -129 +129 @@
     <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
@@ -141 +141 @@
 }</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

chapter08/kernel.xml

@@ -210 +210 @@
     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.
@@ -319 +321 @@
       <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>
@@ -341 +344 @@
 
       <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,