Changeset c74edb3


Ignore:
Timestamp:
04/15/2021 11:49:46 AM (8 months ago)
Author:
Thomas Trepl (Moody) <thomas@…>
Branches:
ml-11.0, multilib
Children:
feed564
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:
1 added
5 edited

Legend:

Unmodified
Added
Removed
  • chapter08/grub.xml

    r6cc8775 rc74edb3  
    4040  <sect2 role="installation">
    4141    <title>Installation of GRUB</title>
     42
     43    <note>
     44      <para>
     45        If your system has UEFI support and you wish to boot LFS with UEFI,
     46        you can skip this package in LFS,
     47        and install GRUB with UEFI support (and its dependencies) following
     48        <ulink url="&blfs-book;postlfs/grub-efi.html">the BLFS page</ulink>
     49        at the end of this chapter.
     50      </para>
     51    </note>
    4252
    4353    <para>Prepare GRUB for compilation:</para>
  • chapter10/grub.xml

    r6cc8775 rc74edb3  
    1616
    1717  <title>Using GRUB to Set Up the Boot Process</title>
     18
     19  <note>
     20    <para>
     21      If your system has UEFI support and you wish to boot LFS with UEFI,
     22      you should skip this page, and config GRUB with UEFI support
     23      using the instructions provided in
     24      <ulink url="&blfs-book;postlfs/grub-setup.html">the BLFS page</ulink>.
     25    </para>
     26  </note>
    1827
    1928  <sect2>
     
    3746grub-mkrescue --output=grub-img.iso
    3847xorriso -as cdrecord -v dev=/dev/cdrw blank=as_needed grub-img.iso</userinput></screen>
    39 
    40     <note>
    41       <para>
    42         To boot LFS on host systems that have UEFI enabled, the kernel needs to
    43         have been built with the CONFIG_EFI_STUB capability described in the
    44         previous section.  However, LFS can be booted using GRUB2 without such
    45         an addition. To do this, the UEFI Mode and Secure Boot capabilities in
    46         the host system's BIOS need to be turned off.  For details, see <ulink
    47         url="&hints-root;lfs-uefi.txt">
    48         the lfs-uefi.txt hint</ulink> at
    49         &hints-root;lfs-uefi.txt.
    50       </para>
    51     </note>
    5248
    5349  </sect2>
  • chapter10/kernel.xml

    r6cc8775 rc74edb3  
    150150
    151151    <note>
    152       <para>If your host hardware is using UEFI, then the 'make defconfig'
    153       above should automatically add in some EFI-related kernel options.</para>
    154 
    155       <para>In order to allow your LFS kernel to be booted from within your
    156       host's UEFI boot environment, your kernel must have this option
    157       selected:</para>
    158 
    159 <screen role="nodump">Processor type and features  ---&gt;
    160    [*]   EFI stub support  [CONFIG_EFI_STUB]</screen>
    161 
    162       <para>A fuller description of managing UEFI environments from within LFS
    163       is covered by the lfs-uefi.txt hint at
    164       <ulink
    165         url="&hints-root;lfs-uefi.txt"/>.
    166       </para>
     152      <para>If your host hardware is using UEFI and you wish to boot the
     153      LFS system with it, you should adjust some kernel configuration
     154      following <ulink url="&blfs-book;postlfs/grub-setup.html#uefi-kernel">
     155      the BLFS page</ulink>.</para>
    167156    </note>
    168157
  • general.ent

    r6cc8775 rc74edb3  
    2121<!ENTITY generic-versiond "systemd">
    2222
    23 <!ENTITY lfs-root        "http://www.linuxfromscratch.org/">
     23<!ENTITY lfs-root        "https://rivendell.linuxfromscratch.org/">
    2424<!ENTITY blfs-root       "&lfs-root;blfs/">
    2525<!ENTITY blfs-book       "&blfs-root;view/&short-version;/">
  • index.xml

    r6cc8775 rc74edb3  
    55]>
    66<book>
    7 
     7<!-- Another test -->
     8<!-- Another test -->
    89<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="prologue/bookinfo.xml"/>
    910<!--
Note: See TracChangeset for help on using the changeset viewer.