From 615f5b80b0502c3b22e82d49cdd67e009081751c Mon Sep 17 00:00:00 2001
From: Pierre Labastie <pierre.labastie@neuf.fr>
Date: Wed, 1 Sep 2021 11:13:32 +0200
Subject: Remove all versiond entities

---
 chapter10/grub.xml   | 4 ++--
 chapter10/kernel.xml | 8 +++-----
 2 files changed, 5 insertions(+), 7 deletions(-)

(limited to 'chapter10')

diff --git a/chapter10/grub.xml b/chapter10/grub.xml
index f76605f49..d4013767d 100644
--- a/chapter10/grub.xml
+++ b/chapter10/grub.xml
@@ -156,8 +156,8 @@ 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
+menuentry "GNU/Linux, Linux &linux-version;-lfs-&version;" {
+        linux   /boot/vmlinuz-&linux-version;-lfs-&version; root=/dev/sda2 ro
 }</literal>
 EOF</userinput></screen>
 
diff --git a/chapter10/kernel.xml b/chapter10/kernel.xml
index 1a2861856..1465c3bcf 100644
--- a/chapter10/kernel.xml
+++ b/chapter10/kernel.xml
@@ -228,7 +228,7 @@ File systems  ---&gt;
 
 <screen revision="sysv"><userinput remap="install">cp -iv arch/x86/boot/bzImage /boot/vmlinuz-&linux-version;-lfs-&version;</userinput></screen>
 
-<screen revision="systemd"><userinput remap="install">cp -iv arch/x86/boot/bzImage /boot/vmlinuz-&linux-version;-lfs-&versiond;</userinput></screen>
+<screen revision="systemd"><userinput remap="install">cp -iv arch/x86/boot/bzImage /boot/vmlinuz-&linux-version;-lfs-&version;</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,
@@ -337,8 +337,7 @@ EOF</userinput></screen>
 
       <seglistitem>
         <seg>config-&linux-version;,
-        <phrase revision="sysv">vmlinuz-&linux-version;-lfs-&version;,</phrase>
-        <phrase revision="systemd">vmlinuz-&linux-version;-lfs-&versiond;,</phrase>
+        vmlinuz-&linux-version;-lfs-&version;
         and System.map-&linux-version;</seg>
         <seg>/lib/modules, /usr/share/doc/linux-&linux-version;</seg>
       </seglistitem>
@@ -360,8 +359,7 @@ EOF</userinput></screen>
       </varlistentry>
 
       <varlistentry id="lfskernel">
-        <term revision="sysv"><filename>vmlinuz-&linux-version;-lfs-&version;</filename></term>
-        <term revision="systemd"><filename>vmlinuz-&linux-version;-lfs-&versiond;</filename></term>
+        <term><filename>vmlinuz-&linux-version;-lfs-&version;</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