From e737017b856e9c8638a049bb0114eb7d51d6c3cc Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Wed, 27 Nov 2019 13:42:57 +0100 Subject: [PATCH] pid1: make TimeoutAbortSec settable for transient units It was documented to be, but implementation was missing. --- src/core/dbus-service.c | 7 +++++++ src/shared/bus-unit-util.c | 1 + 2 files changed, 8 insertions(+) diff --git a/src/core/dbus-service.c b/src/core/dbus-service.c index 3a58977c383..5cf9b21890e 100644 --- a/src/core/dbus-service.c +++ b/src/core/dbus-service.c @@ -309,6 +309,13 @@ static int bus_service_set_transient_property( if (streq(name, "TimeoutStopUSec")) return bus_set_transient_usec(u, name, &s->timeout_stop_usec, message, flags, error); + if (streq(name, "TimeoutAbortUSec")) { + r = bus_set_transient_usec(u, name, &s->timeout_abort_usec, message, flags, error); + if (r >= 0 && !UNIT_WRITE_FLAGS_NOOP(flags)) + s->timeout_abort_set = true; + return r; + } + if (streq(name, "RuntimeMaxUSec")) return bus_set_transient_usec(u, name, &s->runtime_max_usec, message, flags, error); diff --git a/src/shared/bus-unit-util.c b/src/shared/bus-unit-util.c index 64c0d128b85..22a15493d7f 100644 --- a/src/shared/bus-unit-util.c +++ b/src/shared/bus-unit-util.c @@ -1485,6 +1485,7 @@ static int bus_append_service_property(sd_bus_message *m, const char *field, con if (STR_IN_SET(field, "RestartSec", "TimeoutStartSec", "TimeoutStopSec", + "TimeoutAbortSec", "RuntimeMaxSec", "WatchdogSec")) return bus_append_parse_sec_rename(m, field, eq); -- 2.39.2