From: Mike Yuan <me@yhndnzj.com>
Date: Tue, 22 Oct 2024 17:30:50 +0000 (+0200)
Subject: core/service: call service_enter_running() if live mount fails
X-Git-Tag: v257-rc1~147^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=20366875f9d8b1a6281eb776e99e4e004df81fbe;p=thirdparty%2Fsystemd.git

core/service: call service_enter_running() if live mount fails

service_enter_running() would re-arm timer for RuntimeMaxSec=,
hence it should be called instead of disabling timer completely
when live mount operation fails, in a similar fashion as
service_enter_reload_by_notify().
---

diff --git a/src/core/service.c b/src/core/service.c
index ab4467ab8aa..c7683090ef5 100644
--- a/src/core/service.c
+++ b/src/core/service.c
@@ -5299,7 +5299,7 @@ static int service_live_mount(Unit *u,
 
 fail:
         s->live_mount_result = SERVICE_FAILURE_RESOURCES;
-        s->timer_event_source = sd_event_source_disable_unref(s->timer_event_source);
+        service_enter_running(s, SERVICE_SUCCESS);
         return r;
 }