From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Wed, 27 Nov 2019 12:42:57 +0000 (+0100)
Subject: pid1: make TimeoutAbortSec settable for transient units
X-Git-Tag: v244~18^2~1
X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fsystemd.git;a=commitdiff_plain;h=e737017b856e9c8638a049bb0114eb7d51d6c3cc

pid1: make TimeoutAbortSec settable for transient units

It was documented to be, but implementation was missing.
---

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);