summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorKay Sievers <kay@vrfy.org>2013-03-28 03:42:39 +0100
committerKay Sievers <kay@vrfy.org>2013-03-28 03:43:29 +0100
commit33696ef4582c806b226ef5f65d420f60ff641d14 (patch)
tree8d56099792448134e63dfc08afb8aed077c5fc44 /src
parentf0b647223ded79068dd1d92da329d2ea95527590 (diff)
bootctl: Binary: --> File:
Diffstat (limited to 'src')
-rw-r--r--src/boot/bootctl.c37
1 files changed, 20 insertions, 17 deletions
diff --git a/src/boot/bootctl.c b/src/boot/bootctl.c
index 4ec5d8196d..bdefd57dfc 100644
--- a/src/boot/bootctl.c
+++ b/src/boot/bootctl.c
@@ -143,45 +143,48 @@ static int show_status(char **args, unsigned n) {
err = boot_info_query(info);
- printf("Identification:\n");
+ printf("System:\n");
printf(" Machine ID: %s\n", sd_id128_to_string(info->machine_id, buf));
printf(" Boot ID: %s\n", sd_id128_to_string(info->boot_id, buf));
- printf("\n");
-
- printf("Firmware:\n");
if (info->fw_type)
- printf(" Type: %s (%s)\n", info->fw_type, strna(info->fw_info));
-
+ printf(" Firmware: %s (%s)\n", info->fw_type, strna(info->fw_info));
if (info->fw_secure_boot >= 0)
printf(" Secure Boot: %s\n", info->fw_secure_boot ? "enabled" : "disabled");
if (info->fw_secure_boot_setup_mode >= 0)
printf(" Setup Mode: %s\n", info->fw_secure_boot_setup_mode ? "setup" : "user");
+ printf("\n");
if (info->fw_entry_active >= 0) {
+ printf("Selected Firmware Entry:\n");
printf(" Title: %s\n", strna(info->fw_entries[info->fw_entry_active].title));
- if (info->fw_entries[info->fw_entry_active].path)
- printf(" Binary: %s\n", info->fw_entries[info->fw_entry_active].path);
if (!sd_id128_equal(info->fw_entries[info->fw_entry_active].part_uuid, SD_ID128_NULL))
- printf(" Partition: /dev/disk/by-partuuid/%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x\n",
+ printf(" ESP: /dev/disk/by-partuuid/%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x\n",
SD_ID128_FORMAT_VAL(info->fw_entries[info->fw_entry_active].part_uuid));
+ else
+ printf(" ESP: n/a\n");
+ if (info->fw_entries[info->fw_entry_active].path)
+ printf(" File: %s%s\n", draw_special_char(DRAW_TREE_RIGHT), info->fw_entries[info->fw_entry_active].path);
}
printf("\n");
if (info->loader) {
- printf("Boot loader:\n");
- printf(" Type: %s\n", info->loader);
- printf(" Binary: %s\n", strna(info->loader_image_path));
+ printf("Boot Loader:\n");
+ printf(" Product: %s\n", info->loader);
if (!sd_id128_equal(info->loader_part_uuid, SD_ID128_NULL))
- printf(" Partition: /dev/disk/by-partuuid/%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x\n",
+ printf(" ESP: /dev/disk/by-partuuid/%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x\n",
SD_ID128_FORMAT_VAL(info->loader_part_uuid));
+ else
+ printf(" ESP: n/a\n");
+ printf(" File: %s%s\n", draw_special_char(DRAW_TREE_RIGHT), strna(info->loader_image_path));
+ printf("\n");
if (info->loader_entry_active >= 0) {
+ printf("Selected Boot Loader Entry:\n");
printf(" Title: %s\n", strna(info->loader_entries[info->loader_entry_active].title));
- printf(" Entry: %s\n", info->loader_entries[info->loader_entry_active].path);
+ printf(" File: %s\n", info->loader_entries[info->loader_entry_active].path);
+ if (info->loader_options_added)
+ printf(" Options: %s\n", info->loader_options_added);
}
-
- if (info->loader_options_added)
- printf(" Options: %s\n", info->loader_options_added);
} else
printf("No suitable data is provided by the boot manager. See:\n"
" http://www.freedesktop.org/wiki/Software/systemd/BootLoaderInterface\n"