summaryrefslogtreecommitdiffstats
path: root/src/boot
diff options
context:
space:
mode:
authorKay Sievers <kay@vrfy.org>2013-03-10 23:18:50 +0100
committerKay Sievers <kay@vrfy.org>2013-03-10 23:18:50 +0100
commit0876dc1c26b123c3f955e0a34da6ab0375786cea (patch)
treeb3cc77c8432354509c82e57829264ffd1096db4b /src/boot
parentbootctl: print secure boot flags (diff)
downloadsystemd-0876dc1c26b123c3f955e0a34da6ab0375786cea.tar.xz
systemd-0876dc1c26b123c3f955e0a34da6ab0375786cea.zip
bootctl: print Options only when found
Diffstat (limited to 'src/boot')
-rw-r--r--src/boot/bootctl.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/boot/bootctl.c b/src/boot/bootctl.c
index 35daad81c6..b916012b40 100644
--- a/src/boot/bootctl.c
+++ b/src/boot/bootctl.c
@@ -155,7 +155,7 @@ static int show_status(char **args, unsigned n) {
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(" Setup Mode: %s\n", info->fw_secure_boot_setup_mode ? "setup" : "user");
if (info->fw_entry_active >= 0) {
printf(" Title: %s\n", strna(info->fw_entries[info->fw_entry_active].title));
@@ -180,7 +180,8 @@ static int show_status(char **args, unsigned n) {
printf(" Entry: %s\n", info->loader_entries[info->loader_entry_active].path);
}
- printf(" Options: %s\n", strna(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"