From: Mike Yuan Date: Sat, 2 Mar 2024 13:03:22 +0000 (+0800) Subject: core/service: Type=notify/dbus services shouldn't be considered active X-Git-Tag: v256-rc1~618^2~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1651ce09c049d7dae1b987f0a74d54e7c1bc3231;p=thirdparty%2Fsystemd.git core/service: Type=notify/dbus services shouldn't be considered active when ExitType=cgroup and main process exits Follow-up for ef4300654e70e76ed74f7d544e0f44c5d92fb698 --- diff --git a/src/core/service.c b/src/core/service.c index f11ef0859a6..a2a8e4af697 100644 --- a/src/core/service.c +++ b/src/core/service.c @@ -3877,11 +3877,13 @@ static void service_sigchld_event(Unit *u, pid_t pid, int code, int status) { default: assert_not_reached(); } - } else if (s->exit_type == SERVICE_EXIT_CGROUP && s->state == SERVICE_START) + } else if (s->exit_type == SERVICE_EXIT_CGROUP && s->state == SERVICE_START && + !IN_SET(s->type, SERVICE_NOTIFY, SERVICE_NOTIFY_RELOAD, SERVICE_DBUS)) /* If a main process exits very quickly, this function might be executed * before service_dispatch_exec_io(). Since this function disabled IO events * to monitor the main process above, we need to update the state here too. - * Let's consider the process is successfully launched and exited. */ + * Let's consider the process is successfully launched and exited, but + * only when we're not expecting a readiness notification or dbus name. */ service_enter_start_post(s); }