core: check return value of rm_rf_dangerous and warn if it fails

[elogind.git] / src / boot / bootctl.c

diff --git a/src/boot/bootctl.c b/src/boot/bootctl.c
index 35daad81c60c23d049a319db4fdd2e800c809770..4ec5d8196d1c10901bab4935df18b043bb14b52c 100644 (file)
--- a/src/boot/bootctl.c
+++ b/src/boot/bootctl.c
@@ -143,8 +143,8 @@ static int show_status(char **args, unsigned n) {
 
         err = boot_info_query(info);
 
-        printf("Machine:\n");
-        printf("           ID: %s\n", sd_id128_to_string(info->machine_id, buf));
+        printf("Identification:\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");
 
@@ -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"