X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fboot%2Fbootctl.c;h=b916012b40cfa5d8f244c41c79a0c66edcdd9b15;hb=0876dc1c26b123c3f955e0a34da6ab0375786cea;hp=35daad81c60c23d049a319db4fdd2e800c809770;hpb=bc6f2e7c62bcd08177f879423188c54289694619;p=elogind.git

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