summaryrefslogtreecommitdiff
path: root/src/boot
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2018-06-22 19:39:17 +0200
committerLennart Poettering <lennart@poettering.net>2018-10-08 21:40:44 +0200
commit7fd66f3c3d51879611c5e9984df9ba8cd593de74 (patch)
tree2baf90585f398979c1b3c4748378f93d273a1e22 /src/boot
parent9c4a6c131962fd5c5553e83bfc83a4c8ceec0211 (diff)
downloadsystemd-7fd66f3c3d51879611c5e9984df9ba8cd593de74.tar.gz
bootctl: reword status/list section headers a bit
This is really confusing, let's try to clean this up a bit, in particular as there are two very similar concepts: 1. The boot loaders, i.e. the category you find systemd-boot, the Windows and Apple boot loaders in. These may typically be listed in the firmware's EFI variables. 2. The boot loader entries, as defined by the Boot Loader Spec. In this category you find the various Linux kernels that are installed, i.e. the stuff systemd-boot shows on screen. To make things confusing, the Windows and Apple boot loaders can appear both as boot loaders and as boot loader entries. This tries to establish the following nomenclature: "boot loaders" and "boot loader entries" for these two concepts.
Diffstat (limited to 'src/boot')
-rw-r--r--src/boot/bootctl.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/boot/bootctl.c b/src/boot/bootctl.c
index 6b08e3a209..7c072f8862 100644
--- a/src/boot/bootctl.c
+++ b/src/boot/bootctl.c
@@ -167,7 +167,7 @@ static int enumerate_binaries(const char *esp_path, const char *path, const char
static int status_binaries(const char *esp_path, sd_id128_t partition) {
int r;
- printf("Boot Loader Binaries:\n");
+ printf("Available Boot Loaders on ESP:\n");
if (!esp_path) {
printf(" ESP: Cannot find or access mount point of ESP.\n\n");
@@ -242,7 +242,7 @@ static int status_variables(void) {
return log_error_errno(n_order, "Failed to read EFI boot order.");
/* print entries in BootOrder first */
- printf("Boot Loader Entries in EFI Variables:\n");
+ printf("Boot Loaders Listed in EFI Variables:\n");
for (i = 0; i < n_order; i++)
print_efi_option(order[i], true);
@@ -276,7 +276,7 @@ static int status_entries(const char *esp_path, sd_id128_t partition) {
else {
const BootEntry *e = &config.entries[config.default_entry];
- printf("Default Boot Entry:\n");
+ printf("Default Boot Loader Entry:\n");
printf(" title: %s\n", boot_entry_title(e));
if (e->version)
@@ -958,7 +958,7 @@ static int verb_status(int argc, char *argv[], void *userdata) {
printf(" Setup Mode: %s\n", is_efi_secure_boot_setup_mode() ? "setup" : "user");
printf("\n");
- printf("Current Loader:\n");
+ printf("Current Boot Loader:\n");
printf(" Product: %s\n", strna(loader));
if (stub)
printf(" Stub: %s\n", stub);
@@ -1013,7 +1013,7 @@ static int verb_list(int argc, char *argv[], void *userdata) {
if (r < 0)
return r;
- printf("Available boot entries:\n");
+ printf("Boot Loader Entries:\n");
for (n = 0; n < config.n_entries; n++) {
const BootEntry *e = &config.entries[n];