picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

man: use systemd-boot instead of sd-boot

Browse source
This commit is contained in:
Yu Watanabe 2018-06-15 14:25:22 +09:00
parent 3177e14c4d
commit 70c8db7555
4 changed files with 20 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
man/bootctl.xml
View file

@ -46,7 +46,7 @@
<para><command>bootctl</command> can check the EFI boot loader status, list <para><command>bootctl</command> can check the EFI boot loader status, list
available entries, and install, update, or remove the available entries, and install, update, or remove the
<citerefentry><refentrytitle>sd-boot</refentrytitle><manvolnum>7</manvolnum></citerefentry> <citerefentry><refentrytitle>systemd-boot</refentrytitle><manvolnum>7</manvolnum></citerefentry>
boot loader on the current system.</para> boot loader on the current system.</para>
<para><command>bootctl status</command> shows the currently installed versions of <para><command>bootctl status</command> shows the currently installed versions of
@ -56,7 +56,7 @@
</para> </para>
<para><command>bootctl update</command> updates all installed versions of <para><command>bootctl update</command> updates all installed versions of
<citerefentry><refentrytitle>sd-boot</refentrytitle><manvolnum>7</manvolnum></citerefentry>, <citerefentry><refentrytitle>systemd-boot</refentrytitle><manvolnum>7</manvolnum></citerefentry>,
if the current version is newer than the version installed in the EFI system if the current version is newer than the version installed in the EFI system
partition. This also includes the EFI default/fallback loader at partition. This also includes the EFI default/fallback loader at
<filename><replaceable>ESP</replaceable>/EFI/BOOT/BOOT*.EFI</filename>. A <filename><replaceable>ESP</replaceable>/EFI/BOOT/BOOT*.EFI</filename>. A
@ -115,7 +115,7 @@
<refsect1> <refsect1>
<title>See Also</title> <title>See Also</title>
<para> <para>
<citerefentry><refentrytitle>sd-boot</refentrytitle><manvolnum>7</manvolnum></citerefentry>, <citerefentry><refentrytitle>systemd-boot</refentrytitle><manvolnum>7</manvolnum></citerefentry>,
<ulink url="https://www.freedesktop.org/wiki/Specifications/BootLoaderSpec">Boot Loader Specification</ulink>, <ulink url="https://www.freedesktop.org/wiki/Specifications/BootLoaderSpec">Boot Loader Specification</ulink>,
<ulink url="https://www.freedesktop.org/wiki/Software/systemd/BootLoaderInterface">Boot Loader Interface</ulink> <ulink url="https://www.freedesktop.org/wiki/Software/systemd/BootLoaderInterface">Boot Loader Interface</ulink>
</para> </para>

8
man/loader.conf.xml
View file

@ -18,7 +18,7 @@
<refnamediv> <refnamediv>
<refname>loader.conf</refname> <refname>loader.conf</refname>
<refpurpose>Configuration file for sd-boot</refpurpose> <refpurpose>Configuration file for systemd-boot</refpurpose>
</refnamediv> </refnamediv>
<refsynopsisdiv> <refsynopsisdiv>
@ -31,7 +31,7 @@
<title>Description</title> <title>Description</title>
<para> <para>
<citerefentry><refentrytitle>sd-boot</refentrytitle><manvolnum>7</manvolnum></citerefentry> <citerefentry><refentrytitle>systemd-boot</refentrytitle><manvolnum>7</manvolnum></citerefentry>
will read <filename>/loader/loader.conf</filename> and any files with the will read <filename>/loader/loader.conf</filename> and any files with the
<literal>.conf</literal> extension under <literal>.conf</literal> extension under
<filename>/loader/loader.conf.d/</filename> on the EFI system partition (ESP). <filename>/loader/loader.conf.d/</filename> on the EFI system partition (ESP).
@ -72,7 +72,7 @@
<para>If the timeout is disabled, the default entry will be booted <para>If the timeout is disabled, the default entry will be booted
immediately. The menu can be shown by pressing and holding a key before immediately. The menu can be shown by pressing and holding a key before
sd-boot is launched.</para> systemd-boot is launched.</para>
</listitem> </listitem>
</varlistentry> </varlistentry>
@ -178,7 +178,7 @@ editor no
<refsect1> <refsect1>
<title>See Also</title> <title>See Also</title>
<para> <para>
<citerefentry><refentrytitle>sd-boot</refentrytitle><manvolnum>7</manvolnum></citerefentry>, <citerefentry><refentrytitle>systemd-boot</refentrytitle><manvolnum>7</manvolnum></citerefentry>,
<citerefentry><refentrytitle>bootctl</refentrytitle><manvolnum>1</manvolnum></citerefentry> <citerefentry><refentrytitle>bootctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>
</para> </para>
</refsect1> </refsect1>

2
man/rules/meson.build
View file

@ -47,7 +47,6 @@ manpages = [
['resolvectl', '1', ['resolvconf'], 'ENABLE_RESOLVE'], ['resolvectl', '1', ['resolvconf'], 'ENABLE_RESOLVE'],
['resolved.conf', '5', ['resolved.conf.d'], 'ENABLE_RESOLVE'], ['resolved.conf', '5', ['resolved.conf.d'], 'ENABLE_RESOLVE'],
['runlevel', '8', [], 'ENABLE_UTMP'], ['runlevel', '8', [], 'ENABLE_UTMP'],
['sd-boot', '7', [], 'ENABLE_EFI'],
['sd-bus-errors', ['sd-bus-errors',
'3', '3',
['SD_BUS_ERROR_ACCESS_DENIED', ['SD_BUS_ERROR_ACCESS_DENIED',
@ -541,6 +540,7 @@ manpages = [
['systemd-ask-password', '1', [], ''], ['systemd-ask-password', '1', [], ''],
['systemd-backlight@.service', '8', ['systemd-backlight'], 'ENABLE_BACKLIGHT'], ['systemd-backlight@.service', '8', ['systemd-backlight'], 'ENABLE_BACKLIGHT'],
['systemd-binfmt.service', '8', ['systemd-binfmt'], 'ENABLE_BINFMT'], ['systemd-binfmt.service', '8', ['systemd-binfmt'], 'ENABLE_BINFMT'],
['systemd-boot', '7', ['sd-boot'], 'ENABLE_EFI'],
['systemd-cat', '1', [], ''], ['systemd-cat', '1', [], ''],
['systemd-cgls', '1', [], ''], ['systemd-cgls', '1', [], ''],
['systemd-cgtop', '1', [], ''], ['systemd-cgtop', '1', [], ''],

23
man/sd-boot.xml → man/systemd-boot.xml
View file

@ -4,19 +4,20 @@
<!-- SPDX-License-Identifier: LGPL-2.1+ --> <!-- SPDX-License-Identifier: LGPL-2.1+ -->
<refentry id="sd-boot" conditional='ENABLE_EFI' <refentry id="systemd-boot" conditional='ENABLE_EFI'
xmlns:xi="http://www.w3.org/2001/XInclude"> xmlns:xi="http://www.w3.org/2001/XInclude">
<refentryinfo> <refentryinfo>
<title>sd-boot</title> <title>systemd-boot</title>
<productname>systemd</productname> <productname>systemd</productname>
</refentryinfo> </refentryinfo>
<refmeta> <refmeta>
<refentrytitle>sd-boot</refentrytitle> <refentrytitle>systemd-boot</refentrytitle>
<manvolnum>7</manvolnum> <manvolnum>7</manvolnum>
</refmeta> </refmeta>
<refnamediv> <refnamediv>
<refname>systemd-boot</refname>
<refname>sd-boot</refname> <refname>sd-boot</refname>
<refpurpose>A simple UEFI boot manager</refpurpose> <refpurpose>A simple UEFI boot manager</refpurpose>
</refnamediv> </refnamediv>
@ -27,15 +28,15 @@
<para><command>systemd-boot</command> or <command>sd-boot</command> is a simple <para><command>systemd-boot</command> or <command>sd-boot</command> is a simple
UEFI boot manager, previously known as <command>gummiboot</command>. It provides UEFI boot manager, previously known as <command>gummiboot</command>. It provides
a graphical menu to select the entry to boot and an editor for the kernel command a graphical menu to select the entry to boot and an editor for the kernel command
line. sd-boot is only useful on machines using UEFI. line. systemd-boot is only useful on machines using UEFI.
</para> </para>
<para>sd-boot loads information from the EFI system partition (ESP), usually <para>systemd-boot loads information from the EFI system partition (ESP), usually
mounted at <filename>/boot</filename>, <filename>/efi</filename>, or mounted at <filename>/boot</filename>, <filename>/efi</filename>, or
<filename>/boot/efi</filename>. Configuration file fragments, kernels, initrds, <filename>/boot/efi</filename>. Configuration file fragments, kernels, initrds,
other EFI images need to reside on the ESP. Linux kernels must be built with other EFI images need to reside on the ESP. Linux kernels must be built with
<option>CONFIG_EFI_STUB</option> to be able to be directly executed as an EFI <option>CONFIG_EFI_STUB</option> to be able to be directly executed as an EFI
image. sd-boot will automatically list other boot entries registered as EFI boot image. systemd-boot will automatically list other boot entries registered as EFI boot
variables, and a list of kernels from configuration files following the <ulink variables, and a list of kernels from configuration files following the <ulink
url="https://www.freedesktop.org/wiki/Specifications/BootLoaderSpec">Boot Loader url="https://www.freedesktop.org/wiki/Specifications/BootLoaderSpec">Boot Loader
Specification</ulink> located under <filename>/loader/entries/</filename> on the Specification</ulink> located under <filename>/loader/entries/</filename> on the
@ -46,9 +47,9 @@
with the Boot Loader Specification. with the Boot Loader Specification.
<citerefentry><refentrytitle>bootctl</refentrytitle><manvolnum>1</manvolnum></citerefentry> <citerefentry><refentrytitle>bootctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>
may be used from a running system to locate the ESP, list available entries, and may be used from a running system to locate the ESP, list available entries, and
install sd-boot itself.</para> install systemd-boot itself.</para>
<para>sd-boot will provide information about the time spent in UEFI firmware <para>systemd-boot will provide information about the time spent in UEFI firmware
using the using the
<ulink url="https://www.freedesktop.org/wiki/Software/systemd/BootLoaderInterface">Boot Loader Interface</ulink>. <ulink url="https://www.freedesktop.org/wiki/Software/systemd/BootLoaderInterface">Boot Loader Interface</ulink>.
This information can be displayed using This information can be displayed using
@ -59,7 +60,7 @@
<refsect1> <refsect1>
<title>Configuration</title> <title>Configuration</title>
<para>sd-boot reads configuration like the timeout and default entry from <para>systemd-boot reads configuration like the timeout and default entry from
<filename>/loader/loader.conf</filename> on the ESP and from EFI variables. See <filename>/loader/loader.conf</filename> on the ESP and from EFI variables. See
<citerefentry><refentrytitle>loader.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>. <citerefentry><refentrytitle>loader.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>.
</para> </para>
@ -111,7 +112,7 @@
<varlistentry> <varlistentry>
<term>v</term> <term>v</term>
<listitem><para>Show sd-boot, UEFI, and firmware versions</para></listitem> <listitem><para>Show systemd-boot, UEFI, and firmware versions</para></listitem>
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>
@ -213,7 +214,7 @@
</varlistentry> </varlistentry>
</variablelist> </variablelist>
<para>Note that unless configured otherwise in the UEFI firmware, sd-boot will <para>Note that unless configured otherwise in the UEFI firmware, systemd-boot will
use the US keyboard layout, so key labels might not match for keys like +/-. use the US keyboard layout, so key labels might not match for keys like +/-.
</para> </para>
</refsect1> </refsect1>