diff options
| author | Xi Ruoyao <xry111@mengyan1223.wang> | 2021-10-13 19:27:35 +0800 |
|---|---|---|
| committer | Xi Ruoyao <xry111@mengyan1223.wang> | 2021-10-13 19:27:35 +0800 |
| commit | 3d7b4f686a3669663fe7c3cb2fb0b8ee7d558f4c (patch) | |
| tree | d42166d4f688a8bf3d2493dc339e29d725afa154 /chapter10 | |
| parent | b17714a9bb9644a8cbfb02582be7d5244434b7ec (diff) | |
clean up after condxml merge
Diffstat (limited to 'chapter10')
| -rw-r--r-- | chapter10/grub.xml | 16 | ||||
| -rw-r--r-- | chapter10/kernel.xml | 4 |
2 files changed, 2 insertions, 18 deletions
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 > /boot/grub/grub.cfg << "EOF" + <screen><userinput>cat > /boot/grub/grub.cfg << "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 > /boot/grub/grub.cfg << "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 ---> 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, |