diff options
| author | Lennart Poettering <lennart@poettering.net> | 2021-08-17 16:26:25 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-17 16:26:25 +0200 |
| commit | f6e40037a0c6f027fd30e141092dd4982cc56050 (patch) | |
| tree | 7cb4c8366a9e42e93a50374b26fef3291bcd5d88 /man | |
| parent | 29278aa41d93bfadd1559c66f569c81ba5187244 (diff) | |
| parent | 2e65d6103d0235d61217c56679e1e1951019f486 (diff) | |
| download | systemd-f6e40037a0c6f027fd30e141092dd4982cc56050.tar.gz | |
Merge pull request #20448 from medhefgo/boot
sd-boot: UI improvements
Diffstat (limited to 'man')
| -rw-r--r-- | man/loader.conf.xml | 39 | ||||
| -rw-r--r-- | man/systemd-boot.xml | 19 |
2 files changed, 41 insertions, 17 deletions
diff --git a/man/loader.conf.xml b/man/loader.conf.xml index 4c0355800c..ffbd897a1f 100644 --- a/man/loader.conf.xml +++ b/man/loader.conf.xml @@ -58,7 +58,44 @@ <listitem><para>A glob pattern to select the default entry. The default entry may be changed in the boot menu itself, in which case the name of the selected entry will be stored as an EFI variable, overriding this option. - </para></listitem> + </para> + + <table> + <title>Automatically detected entries will use the following names:</title> + + <tgroup cols='2'> + <colspec colname='name' /> + <colspec colname='expl' /> + <thead> + <row> + <entry>Name</entry> + <entry>Description</entry> + </row> + </thead> + <tbody> + <row> + <entry>auto-efi-default</entry> + <entry>EFI Default Loader</entry> + </row> + <row> + <entry>auto-efi-shell</entry> + <entry>EFI Shell</entry> + </row> + <row> + <entry>auto-osx</entry> + <entry>macOS</entry> + </row> + <row> + <entry>auto-reboot-to-firmware-setup</entry> + <entry>Reboot Into Firmware Interface</entry> + </row> + <row> + <entry>auto-windows</entry> + <entry>Windows Boot Manager</entry> + </row> + </tbody> + </tgroup> + </table></listitem> </varlistentry> <varlistentry> diff --git a/man/systemd-boot.xml b/man/systemd-boot.xml index 5169bbbd0f..d3306593e4 100644 --- a/man/systemd-boot.xml +++ b/man/systemd-boot.xml @@ -108,6 +108,8 @@ <title>Key bindings</title> <para>The following keys may be used in the boot menu:</para> + <!-- Developer commands Q/v/Ctrl+l deliberately not advertised. --> + <variablelist> <varlistentry> <term><keycap>↑</keycap> (Up)</term> @@ -150,31 +152,16 @@ </varlistentry> <varlistentry> - <term><keycap>v</keycap></term> - <listitem><para>Show systemd-boot, UEFI, and firmware versions</para></listitem> - </varlistentry> - - <varlistentry> - <term><keycap>P</keycap></term> + <term><keycap>p</keycap></term> <listitem><para>Print status</para></listitem> </varlistentry> <varlistentry> - <term><keycap>Q</keycap></term> - <listitem><para>Quit</para></listitem> - </varlistentry> - - <varlistentry> <term><keycap>h</keycap></term> <term><keycap>?</keycap></term> <term><keycap>F1</keycap></term> <listitem><para>Show a help screen</para></listitem> </varlistentry> - - <varlistentry> - <term><keycombo><keycap>Ctrl</keycap><keycap>l</keycap></keycombo></term> - <listitem><para>Reprint the screen</para></listitem> - </varlistentry> </variablelist> <para>The following keys may be pressed during bootup or in the boot menu to directly boot a specific |