dev-setup: make NULL as parameter for dev_setup() equivalent to ""

[elogind.git] / src / journal / journalctl.c

diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
index b0d8258dd213dda9428009baa3ccacf259a5301a..36c3d2b6883c4bd27fa02578338179519e953cec 100644 (file)
--- a/src/journal/journalctl.c
+++ b/src/journal/journalctl.c
@@ -233,6 +233,7 @@ static int parse_argv(int argc, char *argv[]) {
                 case ARG_VERIFY_KEY:
                         arg_action = ACTION_VERIFY;
                         arg_verify_key = optarg;
+                        arg_local = true;
                         break;
 
                 case ARG_INTERVAL:
@@ -590,7 +591,8 @@ static int setup_keys(void) {
                 fprintf(stderr,
                         "\n"
                         "The new key pair has been generated. The " ANSI_HIGHLIGHT_ON "secret sealing key" ANSI_HIGHLIGHT_OFF " has been written to\n"
-                        "the following local file. It should not be used on multiple hosts.\n"
+                        "the following local file. This key file is automatically updated when the\n"
+                        "sealing key is advanced. It should not be used on multiple hosts.\n"
                         "\n"
                         "\t%s\n"
                         "\n"
@@ -619,12 +621,12 @@ 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);
 #endif
                 free(hn);
@@ -657,13 +659,15 @@ static int verify(sd_journal *j) {
 
         assert(j);
 
+        log_show_color(true);
+
         HASHMAP_FOREACH(f, j->files, i) {
                 int k;
                 usec_t from, to, total;
 
 #ifdef HAVE_GCRYPT
                 if (!arg_verify_key && JOURNAL_HEADER_SEALED(f->header))
-                        log_warning("Journal file %s has sealing enabled but verification key has not been passed using --verify-key=.", f->path);
+                        log_notice("Journal file %s has sealing enabled but verification key has not been passed using --verify-key=.", f->path);
 #endif
 
                 k = journal_file_verify(f, arg_verify_key, &from, &to, &total, true);