Skip to content

Commit

Permalink
man: cross-link to BLS in more places, use "Type #1", "Type #2" as ap…
Browse files Browse the repository at this point in the history
…propriate
  • Loading branch information
keszybz committed Mar 21, 2022
1 parent c3fb1e4 commit a0aa383
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 16 deletions.
7 changes: 4 additions & 3 deletions man/loader.conf.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,11 @@
<title>Description</title>

<para>
<citerefentry><refentrytitle>systemd-boot</refentrytitle><manvolnum>7</manvolnum></citerefentry>
will read <filename><replaceable>ESP</replaceable>/loader/loader.conf</filename> and any files with the
<citerefentry><refentrytitle>systemd-boot</refentrytitle><manvolnum>7</manvolnum></citerefentry> will
read <filename><replaceable>ESP</replaceable>/loader/loader.conf</filename>, and any files with the
<literal>.conf</literal> extension under
<filename><replaceable>ESP</replaceable>/loader/entries/</filename> on the EFI system partition (ESP).
<filename><replaceable>ESP</replaceable>/loader/entries/</filename> on the EFI system partition (ESP) as
defined by <ulink url="https://systemd.io/BOOT_LOADER_SPECIFICATION">Boot Loader Specification</ulink>.
</para>

<para>Each configuration file must consist of an option name, followed by
Expand Down
25 changes: 12 additions & 13 deletions man/systemd-boot.xml
Original file line number Diff line number Diff line change
Expand Up @@ -39,23 +39,22 @@

<itemizedlist>
<listitem><para>Boot entries defined with <ulink
url="https://systemd.io/BOOT_LOADER_SPECIFICATION">Boot Loader Specification</ulink> description files
located in <filename>/loader/entries/</filename> on the ESP and the Extended Boot Loader
Partition. These usually describe Linux kernel images with associated initrd images, but alternatively
may also describe arbitrary other EFI executables.</para></listitem>

<listitem><para>Unified kernel images following the <ulink
url="https://systemd.io/BOOT_LOADER_SPECIFICATION">Boot Loader Specification</ulink>, as executable EFI
binaries in <filename>/EFI/Linux/</filename> on the ESP and the Extended Boot Loader Partition.
</para></listitem>
url="https://systemd.io/BOOT_LOADER_SPECIFICATION">Boot Loader Specification</ulink> Type #1
description files located in <filename>/loader/entries/</filename> on the ESP and the Extended Boot
Loader Partition. These usually describe Linux kernel images with associated initrd images, but
alternatively may also describe other arbitrary EFI executables.</para></listitem>

<listitem><para>Unified kernel images, <ulink url="https://systemd.io/BOOT_LOADER_SPECIFICATION">Boot
Loader Specification</ulink> Type #2, which are executable EFI binaries in
<filename>/EFI/Linux/</filename> on the ESP and the Extended Boot Loader Partition.</para></listitem>

<listitem><para>The Microsoft Windows EFI boot manager, if installed</para></listitem>
<listitem><para>The Microsoft Windows EFI boot manager, if installed.</para></listitem>

<listitem><para>The Apple macOS boot manager, if installed</para></listitem>
<listitem><para>The Apple macOS boot manager, if installed.</para></listitem>

<listitem><para>The EFI Shell binary, if installed</para></listitem>
<listitem><para>The EFI Shell binary, if installed.</para></listitem>

<listitem><para>A reboot into the UEFI firmware setup option, if supported by the firmware</para></listitem>
<listitem><para>A reboot into the UEFI firmware setup option, if supported by the firmware.</para></listitem>
</itemizedlist>

<para><command>systemd-boot</command> supports the following features:</para>
Expand Down

0 comments on commit a0aa383

Please sign in to comment.