projects
/
platform
/
upstream
/
systemd.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
8559b3b
)
manager: tweak manager_journal_is_running() a bit regarding test mode
author
Lennart Poettering
<lennart@poettering.net>
Wed, 7 Feb 2018 14:06:15 +0000
(15:06 +0100)
committer
Lennart Poettering
<lennart@poettering.net>
Mon, 12 Feb 2018 10:34:00 +0000
(11:34 +0100)
In test mode, let's not consider the journal to be up ever: we want all
output to go to stderr.
src/core/manager.c
patch
|
blob
|
history
diff --git
a/src/core/manager.c
b/src/core/manager.c
index
8ae70b6
..
30a020f
100644
(file)
--- a/
src/core/manager.c
+++ b/
src/core/manager.c
@@
-3569,6
+3569,9
@@
static bool manager_journal_is_running(Manager *m) {
assert(m);
+ if (m->test_run_flags != 0)
+ return false;
+
/* If we are the user manager we can safely assume that the journal is up */
if (!MANAGER_IS_SYSTEM(m))
return true;