From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Fri, 19 Apr 2024 20:48:06 +0000 (+0200)
Subject: core: Set a sensible systemd-executor log level in test runs
X-Git-Tag: v256-rc1~64^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=90265bcf9248700739c5ccdac9bf911cf0312877;p=thirdparty%2Fsystemd.git

core: Set a sensible systemd-executor log level in test runs
---

diff --git a/src/core/manager.c b/src/core/manager.c
index 564aa102248..0078f5a33f8 100644
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -5042,11 +5042,10 @@ LogTarget manager_get_executor_log_target(Manager *m) {
         assert(m);
 
         /* If journald is not available tell sd-executor to go to kmsg, as it might be starting journald */
+        if (!MANAGER_IS_TEST_RUN(m) && !manager_journal_is_running(m))
+                return LOG_TARGET_KMSG;
 
-        if (manager_journal_is_running(m))
-                return log_get_target();
-
-        return LOG_TARGET_KMSG;
+        return log_get_target();
 }
 
 static const char* const manager_state_table[_MANAGER_STATE_MAX] = {