From 39fddfa51b30769a5ff34e51fe2eedd19a81409a Mon Sep 17 00:00:00 2001 From: plainlinen Date: Thu, 9 Jun 2022 22:38:18 -0700 Subject: Update documentation for uefi x64 grub boot modes --- AUTHORS.rst | 1 + CHANGELOG.rst | 1 + docs/README.profile.rst | 11 +++++++++-- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/AUTHORS.rst b/AUTHORS.rst index 3a03c0e..aa287ec 100644 --- a/AUTHORS.rst +++ b/AUTHORS.rst @@ -34,3 +34,4 @@ Archiso Authors * Yu Li-Yu * nl6720 * Øyvind Heggstad +* plain linen diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 507bb15..1d6070a 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -9,6 +9,7 @@ Added ----- - Configure the locale for the baseline profile to ``C.UTF-8`` so that a UTF-8 locale is used. +- Add ``uefi-x64.grub.esp`` and ``uefi-x64.grub.eltorito`` boot mode to support x86_64 UEFI boot on x86_64 machines. Changed ------- diff --git a/docs/README.profile.rst b/docs/README.profile.rst index a3d4309..efcb861 100644 --- a/docs/README.profile.rst +++ b/docs/README.profile.rst @@ -48,6 +48,8 @@ The image file is constructed from some of the variables in ``profiledef.sh``: ` - ``bios.syslinux.eltorito``: Syslinux for x86 BIOS booting from an optical disc - ``uefi-ia32.grub.esp``: GRUB for IA32 UEFI booting from a disk - ``uefi-ia32.grub.eltorito``: GRUB for IA32 UEFI booting from an optical disc + - ``uefi-x64.grub.esp``: GRUB for x86_64 UEFI booting from a disk + - ``uefi-x64.grub.eltorito``: GRUB for x86_64 UEFI booting from an optical disc - ``uefi-x64.systemd-boot.esp``: systemd-boot for x86_64 UEFI booting from a disk - ``uefi-x64.systemd-boot.eltorito``: systemd-boot for x86_64 UEFI booting from an optical disc Note that BIOS El Torito boot mode must always be listed before UEFI El Torito boot mode. @@ -168,7 +170,12 @@ The *custom template identifiers* are understood in all `.cfg` files in this dir grub ---- -This directory is mandatory when the ``uefi-ia32.grub.esp`` or ``uefi-ia32.grub.eltorito`` bootmodes are selected in -``profiledef.sh``. +This directory is mandatory when any of the following bootmodes is used in ``profiledef.sh``: + +- ``uefi-ia32.grub.esp`` or +- ``uefi-ia32.grub.eltorito`` or +- ``uefi-x64.grub.esp`` or +- ``uefi-x64.grub.eltorito`` + It contains configuration files for `GRUB `_ used in the resulting image. -- cgit v1.2.3-54-g00ecf