aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authornl6720 <nl6720@gmail.com>2022-06-18 08:38:29 +0300
committernl6720 <nl6720@gmail.com>2022-06-18 08:38:29 +0300
commit2a8fc3bbc0e884eefbe8522ab5f66fbb704e3c25 (patch)
treeeb253cdcf22f640f31cf41f5d463e20a9dd79480 /docs
parentde151089cec6881a8c6c9a27ba095b1fb1637845 (diff)
parent39fddfa51b30769a5ff34e51fe2eedd19a81409a (diff)
downloadarchiso-2a8fc3bbc0e884eefbe8522ab5f66fbb704e3c25.tar.gz
archiso-2a8fc3bbc0e884eefbe8522ab5f66fbb704e3c25.tar.bz2
Merge remote-tracking branch 'origin/merge-requests/256'
After more than ten years, archiso is once again using GRUB. GRUB! Only this time, it's for UEFI not BIOS boot. By plainlinen * origin/merge-requests/256: Update documentation for uefi x64 grub boot modes Use grub for uefi x64 boot modes in profiledef.sh Add *_uefi-x64.grub.* functions to mkarchiso Add useful grub menu entries to grub.cfg Closes #63 and #159 See merge request https://gitlab.archlinux.org/archlinux/archiso/-/merge_requests/256.
Diffstat (limited to 'docs')
-rw-r--r--docs/README.profile.rst11
1 files changed, 9 insertions, 2 deletions
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 <https://www.gnu.org/software/grub/>`_
used in the resulting image.