diff options
| author | Lennart Poettering <lennart@poettering.net> | 2017-09-27 17:30:50 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2017-10-05 13:06:44 +0200 |
| commit | eae51da36e8800f6d466580a817eb5877220376d (patch) | |
| tree | 0800cdd673d73f774a5a1fc1524627e2eef5cd64 /src/core/unit.h | |
| parent | Merge pull request #6944 from poettering/suspend-fix (diff) | |
| download | systemd-eae51da36e8800f6d466580a817eb5877220376d.tar.xz systemd-eae51da36e8800f6d466580a817eb5877220376d.zip | |
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
Diffstat (limited to 'src/core/unit.h')
| -rw-r--r-- | src/core/unit.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/core/unit.h b/src/core/unit.h index 02090ed67d..8c5c92ecd9 100644 --- a/src/core/unit.h +++ b/src/core/unit.h @@ -123,6 +123,7 @@ struct Unit { /* Job timeout and action to take */ usec_t job_timeout; usec_t job_running_timeout; + bool job_running_timeout_set:1; EmergencyAction job_timeout_action; char *job_timeout_reboot_arg; |