shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-12-23 21:35:11 +03:00
Code

Merge pull request #32392 from DaanDeMeyer/executor-log-level

Browse Source 
core: Set a sensible systemd-executor log level in test runs
This commit is contained in:
Daan De Meyer 2024-04-22 19:26:52 +02:00 committed by GitHub
commit e660fee2d0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/core/manager.c
View 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] = {

4
src/shared/mount-util.c
View File

@ -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;
}