From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 25 Nov 2019 13:08:53 +0000 (+0100)
Subject: journald: don't ask for the machine ID if we don't need it
X-Git-Tag: v244~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=806c6a5b97a0bec371c782101a28ff706417b021;p=thirdparty%2Fsystemd.git

journald: don't ask for the machine ID if we don't need it
---

diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c
index b4dd51446a9..f6caf0e212a 100644
--- a/src/journal/journald-server.c
+++ b/src/journal/journald-server.c
@@ -1115,7 +1115,6 @@ void server_dispatch_message(
 }
 
 int server_flush_to_var(Server *s, bool require_flag_file) {
-        sd_id128_t machine;
         sd_journal *j = NULL;
         char ts[FORMAT_TIMESPAN_MAX];
         usec_t start;
@@ -1142,10 +1141,6 @@ int server_flush_to_var(Server *s, bool require_flag_file) {
 
         start = now(CLOCK_MONOTONIC);
 
-        r = sd_id128_get_machine(&machine);
-        if (r < 0)
-                return r;
-
         r = sd_journal_open(&j, SD_JOURNAL_RUNTIME_ONLY);
         if (r < 0)
                 return log_error_errno(r, "Failed to read runtime journal: %m");