Skip to content

Commit 70c8db7

Browse files
yuwatayuwata
committed
man: use systemd-boot instead of sd-boot
1 parent 3177e14 commit 70c8db7

File tree

4 files changed

+20
-19
lines changed

4 files changed

+20
-19
lines changed

‎man/bootctl.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646

4747
<para><command>bootctl</command> can check the EFI boot loader status, list
4848
available entries, and install, update, or remove the
49-
<citerefentry><refentrytitle>sd-boot</refentrytitle><manvolnum>7</manvolnum></citerefentry>
49+
<citerefentry><refentrytitle>systemd-boot</refentrytitle><manvolnum>7</manvolnum></citerefentry>
5050
boot loader on the current system.</para>
5151

5252
<para><command>bootctl status</command> shows the currently installed versions of
@@ -56,7 +56,7 @@
5656
</para>
5757

5858
<para><command>bootctl update</command> updates all installed versions of
59-
<citerefentry><refentrytitle>sd-boot</refentrytitle><manvolnum>7</manvolnum></citerefentry>,
59+
<citerefentry><refentrytitle>systemd-boot</refentrytitle><manvolnum>7</manvolnum></citerefentry>,
6060
if the current version is newer than the version installed in the EFI system
6161
partition. This also includes the EFI default/fallback loader at
6262
<filename><replaceable>ESP</replaceable>/EFI/BOOT/BOOT*.EFI</filename>. A
@@ -115,7 +115,7 @@
115115
<refsect1>
116116
<title>See Also</title>
117117
<para>
118-
<citerefentry><refentrytitle>sd-boot</refentrytitle><manvolnum>7</manvolnum></citerefentry>,
118+
<citerefentry><refentrytitle>systemd-boot</refentrytitle><manvolnum>7</manvolnum></citerefentry>,
119119
<ulink url="https://www.freedesktop.org/wiki/Specifications/BootLoaderSpec">Boot Loader Specification</ulink>,
120120
<ulink url="https://www.freedesktop.org/wiki/Software/systemd/BootLoaderInterface">Boot Loader Interface</ulink>
121121
</para>

‎man/loader.conf.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
<refnamediv>
2020
<refname>loader.conf</refname>
21-
<refpurpose>Configuration file for sd-boot</refpurpose>
21+
<refpurpose>Configuration file for systemd-boot</refpurpose>
2222
</refnamediv>
2323

2424
<refsynopsisdiv>
@@ -31,7 +31,7 @@
3131
<title>Description</title>
3232

3333
<para>
34-
<citerefentry><refentrytitle>sd-boot</refentrytitle><manvolnum>7</manvolnum></citerefentry>
34+
<citerefentry><refentrytitle>systemd-boot</refentrytitle><manvolnum>7</manvolnum></citerefentry>
3535
will read <filename>/loader/loader.conf</filename> and any files with the
3636
<literal>.conf</literal> extension under
3737
<filename>/loader/loader.conf.d/</filename> on the EFI system partition (ESP).
@@ -72,7 +72,7 @@
7272

7373
<para>If the timeout is disabled, the default entry will be booted
7474
immediately. The menu can be shown by pressing and holding a key before
75-
sd-boot is launched.</para>
75+
systemd-boot is launched.</para>
7676
</listitem>
7777
</varlistentry>
7878

@@ -178,7 +178,7 @@ editor no
178178
<refsect1>
179179
<title>See Also</title>
180180
<para>
181-
<citerefentry><refentrytitle>sd-boot</refentrytitle><manvolnum>7</manvolnum></citerefentry>,
181+
<citerefentry><refentrytitle>systemd-boot</refentrytitle><manvolnum>7</manvolnum></citerefentry>,
182182
<citerefentry><refentrytitle>bootctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>
183183
</para>
184184
</refsect1>

‎man/rules/meson.build‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ manpages = [
4747
['resolvectl', '1', ['resolvconf'], 'ENABLE_RESOLVE'],
4848
['resolved.conf', '5', ['resolved.conf.d'], 'ENABLE_RESOLVE'],
4949
['runlevel', '8', [], 'ENABLE_UTMP'],
50-
['sd-boot', '7', [], 'ENABLE_EFI'],
5150
['sd-bus-errors',
5251
'3',
5352
['SD_BUS_ERROR_ACCESS_DENIED',
@@ -541,6 +540,7 @@ manpages = [
541540
['systemd-ask-password', '1', [], ''],
542541
['systemd-backlight@.service', '8', ['systemd-backlight'], 'ENABLE_BACKLIGHT'],
543542
['systemd-binfmt.service', '8', ['systemd-binfmt'], 'ENABLE_BINFMT'],
543+
['systemd-boot', '7', ['sd-boot'], 'ENABLE_EFI'],
544544
['systemd-cat', '1', [], ''],
545545
['systemd-cgls', '1', [], ''],
546546
['systemd-cgtop', '1', [], ''],

man/sd-boot.xml renamed to man/systemd-boot.xml

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,20 @@
44

55
<!-- SPDX-License-Identifier: LGPL-2.1+ -->
66

7-
<refentry id="sd-boot" conditional='ENABLE_EFI'
7+
<refentry id="systemd-boot" conditional='ENABLE_EFI'
88
xmlns:xi="http://www.w3.org/2001/XInclude">
99
<refentryinfo>
10-
<title>sd-boot</title>
10+
<title>systemd-boot</title>
1111
<productname>systemd</productname>
1212
</refentryinfo>
1313

1414
<refmeta>
15-
<refentrytitle>sd-boot</refentrytitle>
15+
<refentrytitle>systemd-boot</refentrytitle>
1616
<manvolnum>7</manvolnum>
1717
</refmeta>
1818

1919
<refnamediv>
20+
<refname>systemd-boot</refname>
2021
<refname>sd-boot</refname>
2122
<refpurpose>A simple UEFI boot manager</refpurpose>
2223
</refnamediv>
@@ -27,15 +28,15 @@
2728
<para><command>systemd-boot</command> or <command>sd-boot</command> is a simple
2829
UEFI boot manager, previously known as <command>gummiboot</command>. It provides
2930
a graphical menu to select the entry to boot and an editor for the kernel command
30-
line. sd-boot is only useful on machines using UEFI.
31+
line. systemd-boot is only useful on machines using UEFI.
3132
</para>
3233

33-
<para>sd-boot loads information from the EFI system partition (ESP), usually
34+
<para>systemd-boot loads information from the EFI system partition (ESP), usually
3435
mounted at <filename>/boot</filename>, <filename>/efi</filename>, or
3536
<filename>/boot/efi</filename>. Configuration file fragments, kernels, initrds,
3637
other EFI images need to reside on the ESP. Linux kernels must be built with
3738
<option>CONFIG_EFI_STUB</option> to be able to be directly executed as an EFI
38-
image. sd-boot will automatically list other boot entries registered as EFI boot
39+
image. systemd-boot will automatically list other boot entries registered as EFI boot
3940
variables, and a list of kernels from configuration files following the <ulink
4041
url="https://www.freedesktop.org/wiki/Specifications/BootLoaderSpec">Boot Loader
4142
Specification</ulink> located under <filename>/loader/entries/</filename> on the
@@ -46,9 +47,9 @@
4647
with the Boot Loader Specification.
4748
<citerefentry><refentrytitle>bootctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>
4849
may be used from a running system to locate the ESP, list available entries, and
49-
install sd-boot itself.</para>
50+
install systemd-boot itself.</para>
5051

51-
<para>sd-boot will provide information about the time spent in UEFI firmware
52+
<para>systemd-boot will provide information about the time spent in UEFI firmware
5253
using the
5354
<ulink url="https://www.freedesktop.org/wiki/Software/systemd/BootLoaderInterface">Boot Loader Interface</ulink>.
5455
This information can be displayed using
@@ -59,7 +60,7 @@
5960
<refsect1>
6061
<title>Configuration</title>
6162

62-
<para>sd-boot reads configuration like the timeout and default entry from
63+
<para>systemd-boot reads configuration like the timeout and default entry from
6364
<filename>/loader/loader.conf</filename> on the ESP and from EFI variables. See
6465
<citerefentry><refentrytitle>loader.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>.
6566
</para>
@@ -111,7 +112,7 @@
111112

112113
<varlistentry>
113114
<term>v</term>
114-
<listitem><para>Show sd-boot, UEFI, and firmware versions</para></listitem>
115+
<listitem><para>Show systemd-boot, UEFI, and firmware versions</para></listitem>
115116
</varlistentry>
116117

117118
<varlistentry>
@@ -213,7 +214,7 @@
213214
</varlistentry>
214215
</variablelist>
215216

216-
<para>Note that unless configured otherwise in the UEFI firmware, sd-boot will
217+
<para>Note that unless configured otherwise in the UEFI firmware, systemd-boot will
217218
use the US keyboard layout, so key labels might not match for keys like +/-.
218219
</para>
219220
</refsect1>

0 commit comments

Comments
 (0)