diff options
| author | Lennart Poettering <lennart@poettering.net> | 2015-05-19 18:13:22 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2015-05-19 18:21:19 +0200 |
| commit | c6497ccb7153af9a1252c48918e380b5134314de (patch) | |
| tree | 00e5106e59779057cd200c1995f5b7b92654aa5b /src/core/job.h | |
| parent | 9ee18af3a036074c4021c82ae2e67f5ccaa9ea9d (diff) | |
core: when propagating restart requests due to deps, downgrade restart to try-restart
Previously, if a service A depended on a service B via Requires=, and A
was not running and B restarted this would trigger a start of A as well,
since the restart was propagated as restart independently of the state
of A.
This patch ensures that a restart of B would be propagated as a
try-restart to A, thus not changing its state if it isn't up.
http://lists.freedesktop.org/archives/systemd-devel/2015-May/032061.html
Diffstat (limited to 'src/core/job.h')
| -rw-r--r-- | src/core/job.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/job.h b/src/core/job.h index 9119e4834a..1d1b10f1d3 100644 --- a/src/core/job.h +++ b/src/core/job.h @@ -206,7 +206,7 @@ bool job_type_is_redundant(JobType a, UnitActiveState b) _pure_; /* Collapses a state-dependent job type into a simpler type by observing * the state of the unit which it is going to be applied to. */ -void job_type_collapse(JobType *t, Unit *u); +JobType job_type_collapse(JobType t, Unit *u); int job_type_merge_and_collapse(JobType *a, JobType b, Unit *u); |