From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 7 Feb 2018 14:07:00 +0000 (+0100)
Subject: core: tweak manager_journal_is_running() a bit more
X-Git-Tag: v238~101^2~12
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=217677abb0fa31d85656f35d6a8f4a7632d54173;p=thirdparty%2Fsystemd.git

core: tweak manager_journal_is_running() a bit more

Let's also use the journal if it is currently reloading. In that state
it should also be able to process our requests. Moreover, we might
otherwise end up disconnecting/reconnecting from the journal without
really any need to hence, relax the check accordingly.
---

diff --git a/src/core/manager.c b/src/core/manager.c
index 30a020f7778..9c68eb49d19 100644
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -3587,7 +3587,7 @@ static bool manager_journal_is_running(Manager *m) {
         u = manager_get_unit(m, SPECIAL_JOURNALD_SERVICE);
         if (!u)
                 return false;
-        if (SERVICE(u)->state != SERVICE_RUNNING)
+        if (!IN_SET(SERVICE(u)->state, SERVICE_RELOAD, SERVICE_RUNNING))
                 return false;
 
         return true;