unit: when JobTimeoutSec= is turned off, implicitly turn off JobRunningTimeoutSec...

We added JobRunningTimeoutSec= late, and Dracut configured only
JobTimeoutSec= to turn of root device timeouts before. With this change
we'll propagate a reset of JobTimeoutSec= into JobRunningTimeoutSec=,
but only if the latter wasn't set explicitly.

This should restore compatibility with older elogind versions.

Fixes: #6402

diff --git a/src/basic/time-util.c b/src/basic/time-util.c
index 0a0f806e8154af3cdb2e3e2958d83613a6654f0f..7f32cf608fb4e174a8a8a8cc5cd460bd3c9fe5e8 100644 (file)
--- a/src/basic/time-util.c
+++ b/src/basic/time-util.c
@@ -1097,7 +1097,11 @@ int parse_sec(const char *t, usec_t *usec) {
 
 #if 0 /// UNNEEDED by elogind
 int parse_sec_fix_0(const char *t, usec_t *usec) {
+        assert(t);
+        assert(usec);
+
         t += strspn(t, WHITESPACE);
+
         if (streq(t, "0")) {
                 *usec = USEC_INFINITY;
                 return 0;