Changeset c74edb3

Timestamp:

04/15/2021 11:49:46 AM (3 years ago)

Author:

Thomas Trepl (Moody) <thomas@…>

Branches:

ml-11.0, multilib

Children:

feed564d

Parents:

6cc8775 (diff), 0739fa7 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'trunk' into multilib

Files:

• chapter08/grub.xml (modified) (1 diff)
• chapter10/grub.xml (modified) (2 diffs)
• chapter10/kernel.xml (modified) (1 diff)
• general.ent (modified) (1 diff)
• index.xml (modified) (1 diff)
• lfs-latest-git.php (added)

chapter08/grub.xml

@@ -40 +40 @@
   <sect2 role="installation">
     <title>Installation of GRUB</title>
+
+    <note>
+      <para>
+        If your system has UEFI support and you wish to boot LFS with UEFI,
+        you can skip this package in LFS,
+        and install GRUB with UEFI support (and its dependencies) following
+        <ulink url="&blfs-book;postlfs/grub-efi.html">the BLFS page</ulink>
+        at the end of this chapter.
+      </para>
+    </note>
 
     <para>Prepare GRUB for compilation:</para>

chapter10/grub.xml

@@ -16 +16 @@
 
   <title>Using GRUB to Set Up the Boot Process</title>
+
+  <note>
+    <para>
+      If your system has UEFI support and you wish to boot LFS with UEFI,
+      you should skip this page, and config GRUB with UEFI support
+      using the instructions provided in
+      <ulink url="&blfs-book;postlfs/grub-setup.html">the BLFS page</ulink>.
+    </para>
+  </note>
 
   <sect2>
@@ -37 +46 @@
 grub-mkrescue --output=grub-img.iso 
 xorriso -as cdrecord -v dev=/dev/cdrw blank=as_needed grub-img.iso</userinput></screen>
-
-    <note>
-      <para>
-        To boot LFS on host systems that have UEFI enabled, the kernel needs to
-        have been built with the CONFIG_EFI_STUB capability described in the
-        previous section.  However, LFS can be booted using GRUB2 without such
-        an addition. To do this, the UEFI Mode and Secure Boot capabilities in
-        the host system's BIOS need to be turned off.  For details, see <ulink
-        url="&hints-root;lfs-uefi.txt">
-        the lfs-uefi.txt hint</ulink> at
-        &hints-root;lfs-uefi.txt.
-      </para>
-    </note>
 
   </sect2>

chapter10/kernel.xml

@@ -150 +150 @@
 
     <note>
-      <para>If your host hardware is using UEFI, then the 'make defconfig'
-      above should automatically add in some EFI-related kernel options.</para>
-
-      <para>In order to allow your LFS kernel to be booted from within your
-      host's UEFI boot environment, your kernel must have this option
-      selected:</para>
-
-<screen role="nodump">Processor type and features  ---&gt;
-   [*]   EFI stub support  [CONFIG_EFI_STUB]</screen>
-
-      <para>A fuller description of managing UEFI environments from within LFS
-      is covered by the lfs-uefi.txt hint at
-      <ulink 
-        url="&hints-root;lfs-uefi.txt"/>.
-      </para>
+      <para>If your host hardware is using UEFI and you wish to boot the
+      LFS system with it, you should adjust some kernel configuration
+      following <ulink url="&blfs-book;postlfs/grub-setup.html#uefi-kernel">
+      the BLFS page</ulink>.</para>
     </note>
 

general.ent

@@ -21 +21 @@
 <!ENTITY generic-versiond "systemd"> 
 
-<!ENTITY lfs-root        "http://www.linuxfromscratch.org/">
+<!ENTITY lfs-root        "https://rivendell.linuxfromscratch.org/">
 <!ENTITY blfs-root       "&lfs-root;blfs/">
 <!ENTITY blfs-book       "&blfs-root;view/&short-version;/">

index.xml

@@ -5 +5 @@
 ]>
 <book>
-
+<!-- Another test -->
+<!-- Another test -->
 <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="prologue/bookinfo.xml"/>
 <!--