]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
core: Set a sensible systemd-executor log level in test runs
authorDaan De Meyer <daan.j.demeyer@gmail.com>
Fri, 19 Apr 2024 20:48:06 +0000 (22:48 +0200)
committerDaan De Meyer <daan.j.demeyer@gmail.com>
Mon, 22 Apr 2024 14:12:14 +0000 (16:12 +0200)
src/core/manager.c

index 564aa1022484a8c55dd7bc74a2feb6cbe47ac3f0..0078f5a33f8f5e4bc7fc3300d8e8958d5e2b6512 100644 (file)
@@ -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] = {