From 70c8db755558927bdea56e9571c5d71300a81e8e Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Fri, 15 Jun 2018 14:25:22 +0900 Subject: [PATCH] man: use systemd-boot instead of sd-boot --- man/bootctl.xml | 6 +++--- man/loader.conf.xml | 8 ++++---- man/rules/meson.build | 2 +- man/{sd-boot.xml => systemd-boot.xml} | 23 ++++++++++++----------- 4 files changed, 20 insertions(+), 19 deletions(-) rename man/{sd-boot.xml => systemd-boot.xml} (90%) diff --git a/man/bootctl.xml b/man/bootctl.xml index e051f47781..cd7d83ea67 100644 --- a/man/bootctl.xml +++ b/man/bootctl.xml @@ -46,7 +46,7 @@ bootctl can check the EFI boot loader status, list available entries, and install, update, or remove the - sd-boot7 + systemd-boot7 boot loader on the current system. bootctl status shows the currently installed versions of @@ -56,7 +56,7 @@ bootctl update updates all installed versions of - sd-boot7, + systemd-boot7, if the current version is newer than the version installed in the EFI system partition. This also includes the EFI default/fallback loader at ESP/EFI/BOOT/BOOT*.EFI. A @@ -115,7 +115,7 @@ See Also - sd-boot7, + systemd-boot7, Boot Loader Specification, Boot Loader Interface diff --git a/man/loader.conf.xml b/man/loader.conf.xml index 3c85c49ea6..6f8d0489d2 100644 --- a/man/loader.conf.xml +++ b/man/loader.conf.xml @@ -18,7 +18,7 @@ loader.conf - Configuration file for sd-boot + Configuration file for systemd-boot @@ -31,7 +31,7 @@ Description - sd-boot7 + systemd-boot7 will read /loader/loader.conf and any files with the .conf extension under /loader/loader.conf.d/ on the EFI system partition (ESP). @@ -72,7 +72,7 @@ If the timeout is disabled, the default entry will be booted immediately. The menu can be shown by pressing and holding a key before - sd-boot is launched. + systemd-boot is launched. @@ -178,7 +178,7 @@ editor no See Also - sd-boot7, + systemd-boot7, bootctl1 diff --git a/man/rules/meson.build b/man/rules/meson.build index 04f03c6786..9458a4012d 100644 --- a/man/rules/meson.build +++ b/man/rules/meson.build @@ -47,7 +47,6 @@ manpages = [ ['resolvectl', '1', ['resolvconf'], 'ENABLE_RESOLVE'], ['resolved.conf', '5', ['resolved.conf.d'], 'ENABLE_RESOLVE'], ['runlevel', '8', [], 'ENABLE_UTMP'], - ['sd-boot', '7', [], 'ENABLE_EFI'], ['sd-bus-errors', '3', ['SD_BUS_ERROR_ACCESS_DENIED', @@ -541,6 +540,7 @@ manpages = [ ['systemd-ask-password', '1', [], ''], ['systemd-backlight@.service', '8', ['systemd-backlight'], 'ENABLE_BACKLIGHT'], ['systemd-binfmt.service', '8', ['systemd-binfmt'], 'ENABLE_BINFMT'], + ['systemd-boot', '7', ['sd-boot'], 'ENABLE_EFI'], ['systemd-cat', '1', [], ''], ['systemd-cgls', '1', [], ''], ['systemd-cgtop', '1', [], ''], diff --git a/man/sd-boot.xml b/man/systemd-boot.xml similarity index 90% rename from man/sd-boot.xml rename to man/systemd-boot.xml index cec5ba779c..09efbd34a5 100644 --- a/man/sd-boot.xml +++ b/man/systemd-boot.xml @@ -4,19 +4,20 @@ - - sd-boot + systemd-boot systemd - sd-boot + systemd-boot 7 + systemd-boot sd-boot A simple UEFI boot manager @@ -27,15 +28,15 @@ systemd-boot or sd-boot is a simple UEFI boot manager, previously known as gummiboot. It provides 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. - sd-boot loads information from the EFI system partition (ESP), usually + systemd-boot loads information from the EFI system partition (ESP), usually mounted at /boot, /efi, or /boot/efi. Configuration file fragments, kernels, initrds, other EFI images need to reside on the ESP. Linux kernels must be built with 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 Boot Loader Specification located under /loader/entries/ on the @@ -46,9 +47,9 @@ with the Boot Loader Specification. bootctl1 may be used from a running system to locate the ESP, list available entries, and - install sd-boot itself. + install systemd-boot itself. - sd-boot will provide information about the time spent in UEFI firmware + systemd-boot will provide information about the time spent in UEFI firmware using the Boot Loader Interface. This information can be displayed using @@ -59,7 +60,7 @@ Configuration - sd-boot reads configuration like the timeout and default entry from + systemd-boot reads configuration like the timeout and default entry from /loader/loader.conf on the ESP and from EFI variables. See loader.conf5. @@ -111,7 +112,7 @@ v - Show sd-boot, UEFI, and firmware versions + Show systemd-boot, UEFI, and firmware versions @@ -213,7 +214,7 @@ - Note that unless configured otherwise in the UEFI firmware, sd-boot will + 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 +/-.