From: Mike Yuan <me@yhndnzj.com>
Date: Fri, 19 Dec 2025 01:06:11 +0000 (+0100)
Subject: core/manager: use UNIT_IS_ACTIVE_OR_RELOADING rather than hardcoding service states
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=79e6bfb1e67960465b2d4e982962423aa68a43cc;p=thirdparty%2Fsystemd.git

core/manager: use UNIT_IS_ACTIVE_OR_RELOADING rather than hardcoding service states

except for SERVICE_EXITED which has to be checked manually.
---

diff --git a/src/core/manager.c b/src/core/manager.c
index 594e7bc2c75..b627c04c128 100644
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -4350,7 +4350,7 @@ static bool manager_journal_is_running(Manager *m) {
         u = manager_get_unit(m, SPECIAL_JOURNALD_SERVICE);
         if (!u)
                 return false;
-        if (!IN_SET(SERVICE(u)->state, SERVICE_RELOAD, SERVICE_RUNNING))
+        if (!UNIT_IS_ACTIVE_OR_RELOADING(unit_active_state(u)) || SERVICE(u)->state == SERVICE_EXITED)
                 return false;
 
         return true;