From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 20 Aug 2012 20:22:05 +0000 (+0200)
Subject: journal: rearrange QR code output a bit to fi to 80x25 terminals
X-Git-Tag: v189~32
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=adac1c93ab355b8aa45ecbcf7879ec98b44d36f8;p=elogind.git

journal: rearrange QR code output a bit to fi to 80x25 terminals
---

diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
index 3fcdf4b4a..7f25cdb9a 100644
--- a/src/journal/journalctl.c
+++ b/src/journal/journalctl.c
@@ -619,14 +619,13 @@ static int setup_keys(void) {
 
                 if (hn) {
                         hostname_cleanup(hn);
-                        fprintf(stderr, "The keys have been generated for host %s (" SD_ID128_FORMAT_STR ").\n", hn, SD_ID128_FORMAT_VAL(machine));
+                        fprintf(stderr, "\nThe keys have been generated for host %s/" SD_ID128_FORMAT_STR ".\n", hn, SD_ID128_FORMAT_VAL(machine));
                 } else
-                        fprintf(stderr, "The keys have been generated for host " SD_ID128_FORMAT_STR ".\n", SD_ID128_FORMAT_VAL(machine));
+                        fprintf(stderr, "\nThe keys have been generated for host " SD_ID128_FORMAT_STR ".\n", SD_ID128_FORMAT_VAL(machine));
 
 #ifdef HAVE_QRENCODE
-                fputc('\n', stderr);
+                fprintf(stderr, "\nTo transfer the verification key to your phone please scan the QR code below:\n\n");
                 print_qr_code(stderr, seed, seed_size, n, arg_interval, hn, machine);
-                fprintf(stderr, "\nScan this QR code with your mobile phone to transfer the verification key to it.\n");
 #endif
                 free(hn);
         }