From 3d7b4f686a3669663fe7c3cb2fb0b8ee7d558f4c Mon Sep 17 00:00:00 2001
From: Xi Ruoyao <xry111@mengyan1223.wang>
Date: Wed, 13 Oct 2021 19:27:35 +0800
Subject: clean up after condxml merge

---
 chapter10/grub.xml   | 16 +---------------
 chapter10/kernel.xml |  4 +---
 2 files changed, 2 insertions(+), 18 deletions(-)

(limited to 'chapter10')

diff --git a/chapter10/grub.xml b/chapter10/grub.xml
index b35d75540..c569525c9 100644
--- a/chapter10/grub.xml
+++ b/chapter10/grub.xml
@@ -135,7 +135,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 revision="sysv"><userinput>cat &gt; /boot/grub/grub.cfg &lt;&lt; "EOF"
+    <screen><userinput>cat &gt; /boot/grub/grub.cfg &lt;&lt; "EOF"
 <literal># Begin /boot/grub/grub.cfg
 set default=0
 set timeout=5
@@ -148,20 +148,6 @@ 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-&version;" {
-        linux   /boot/vmlinuz-&linux-version;-lfs-&version; 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/chapter10/kernel.xml b/chapter10/kernel.xml
index f77cc9c5c..ca47b0243 100644
--- a/chapter10/kernel.xml
+++ b/chapter10/kernel.xml
@@ -225,9 +225,7 @@ File systems  ---&gt;
     the automatic setup of the boot process described in the next section.  The
     following command assumes an x86 architecture:</para>
 
-<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-&version;</userinput></screen>
+<screen><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,
-- 
cgit v1.2.3-54-g00ecf