From 90265bcf9248700739c5ccdac9bf911cf0312877 Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Fri, 19 Apr 2024 22:48:06 +0200 Subject: [PATCH 1/2] core: Set a sensible systemd-executor log level in test runs --- src/core/manager.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/core/manager.c b/src/core/manager.c index 564aa10224..0078f5a33f 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] = { From 827004df94a896bd2e919dcb6e1bb0567728bb62 Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Mon, 22 Apr 2024 18:01:06 +0200 Subject: [PATCH 2/2] mount-util: Silence noisy trace log message --- src/shared/mount-util.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/shared/mount-util.c b/src/shared/mount-util.c index 72fa4fee43..ed126a76d8 100644 --- a/src/shared/mount-util.c +++ b/src/shared/mount-util.c @@ -79,7 +79,9 @@ int umount_recursive_full(const char *prefix, int flags, char **keep) { continue; if (prefix && !path_startswith(path, prefix)) { - log_trace("Not unmounting %s, outside of prefix: %s", path, prefix); + // FIXME: This is extremely noisy, we're probably doing something very wrong + // to trigger this so often, needs more investigation. + // log_trace("Not unmounting %s, outside of prefix: %s", path, prefix); continue; }