[systemd-commits] src/boot

[Kay Sievers]

 src/boot/bootctl.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 0876dc1c26b123c3f955e0a34da6ab0375786cea
Author: Kay Sievers <kay at vrfy.org>
Date:   Sun Mar 10 23:18:50 2013 +0100

    bootctl: print Options only when found

diff --git a/src/boot/bootctl.c b/src/boot/bootctl.c
index 35daad8..b916012 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"