From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 1 Mar 2019 15:05:14 +0000 (+0100)
Subject: bootctl: tweak 'list' output a bit
X-Git-Tag: v242-rc1~192^2~16
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4629499e7fed6b67e03aa202da1e757160d63582;p=thirdparty%2Fsystemd.git

bootctl: tweak 'list' output a bit

Let's suppress the final newline in the list if it's the last entry we
are outputting.
---

diff --git a/src/boot/bootctl.c b/src/boot/bootctl.c
index 1e0d115fe3e..6c0885198ad 100644
--- a/src/boot/bootctl.c
+++ b/src/boot/bootctl.c
@@ -1214,7 +1214,8 @@ static int verb_list(int argc, char *argv[], void *userdata) {
                         if (r < 0)
                                 return r;
 
-                        puts("");
+                        if (n+1 < config.n_entries)
+                                putchar('\n');
 
                         strv_remove(found_by_loader, config.entries[n].id);
                 }
@@ -1223,7 +1224,7 @@ static int verb_list(int argc, char *argv[], void *userdata) {
         if (!strv_isempty(found_by_loader)) {
                 char **i;
 
-                printf("Automatic/Other Entries Found by Boot Loader:\n\n");
+                printf("\nAutomatic/Other Entries Found by Boot Loader:\n\n");
 
                 STRV_FOREACH(i, found_by_loader)
                         puts(*i);