]> git.ipfire.org Git - thirdparty/systemd.git/commit
unit: when JobTimeoutSec= is turned off, implicitly turn off JobRunningTimeoutSec...
authorLennart Poettering <lennart@poettering.net>
Wed, 27 Sep 2017 15:30:50 +0000 (17:30 +0200)
committerLennart Poettering <lennart@poettering.net>
Thu, 5 Oct 2017 11:06:44 +0000 (13:06 +0200)
commiteae51da36e8800f6d466580a817eb5877220376d
tree0800cdd673d73f774a5a1fc1524627e2eef5cd64
parentc9905d4dd291c1525dc1a075651aade26498b204
unit: when JobTimeoutSec= is turned off, implicitly turn off JobRunningTimeoutSec= too

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 systemd versions.

Fixes: #6402
src/basic/time-util.c
src/core/load-fragment-gperf.gperf.m4
src/core/load-fragment.c
src/core/load-fragment.h
src/core/unit.h