sometimes propagate JobTimeoutSec=0 into JobRunningTimeoutSec= #6931
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
poettering
force-pushed
the
job-timeout-sec
branch
from
28f9e61
to
45d892a
Compare
keszybz
reviewed
Oct 2, 2017
src/core/load-fragment.c
Outdated
| return 0; | ||
| } | ||
|
|
||
| if (usec == USEC_INFINITY) { |
There was a problem hiding this comment.
This should solve the immediate issue, but I had the same thought as @Werkov in #6402 (comment): shouldn't this if be dropped`? This patch restores compatibility for the specific case of timeout=infinity, but not for other values.
…ngTimeoutSec= 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: systemd#6402
poettering
force-pushed
the
job-timeout-sec
branch
from
45d892a
to
acd53ea
Compare
|
Force pushed a new version making the suggested change. PTAL |
| } | ||
|
|
||
| /* If the user explicitly changed JobTimeoutSec= also change JobRunningTimeoutSec=, for compatibility with old | ||
| * versions. If JobRunningTimeoutSec= was explicitly set, avoid this however as whatever the usec picked should |
keszybz
added a commit
that referenced
this pull request
Oct 5, 2017
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
A fix for #6402. Not pretty, but should work.