diff options
| author | Michal Schmidt <mschmidt@redhat.com> | 2011-12-09 15:25:29 +0100 |
|---|---|---|
| committer | Michal Schmidt <mschmidt@redhat.com> | 2011-12-09 15:25:29 +0100 |
| commit | cd0504d0a13d8297b97c9238fd1b94b4141c5aa8 (patch) | |
| tree | d5f2d37df5e132c5156bc98fcb0eac6b846a9022 /src/unit.c | |
| parent | f60c2665f9ba1dd4a6b4a36b2e8195482ada9957 (diff) | |
unit: check for unneeded dependencies even when unit stop was expected
systemd did not stop units marked as "StopWhenUnneeded=yes" when the requiring
unit was stopped on user's request.
Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=704197
Diffstat (limited to 'src/unit.c')
| -rw-r--r-- | src/unit.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/unit.c b/src/unit.c index 56137d7bd1..03c90f5874 100644 --- a/src/unit.c +++ b/src/unit.c @@ -1105,6 +1105,14 @@ static void retroactively_stop_dependencies(Unit *u) { SET_FOREACH(other, u->meta.dependencies[UNIT_BOUND_BY], i) if (!UNIT_IS_INACTIVE_OR_DEACTIVATING(unit_active_state(other))) manager_add_job(u->meta.manager, JOB_STOP, other, JOB_REPLACE, true, NULL, NULL); +} + +static void check_unneeded_dependencies(Unit *u) { + Iterator i; + Unit *other; + + assert(u); + assert(UNIT_IS_INACTIVE_OR_DEACTIVATING(unit_active_state(u))); /* Garbage collect services that might not be needed anymore, if enabled */ SET_FOREACH(other, u->meta.dependencies[UNIT_REQUIRES], i) @@ -1263,6 +1271,10 @@ void unit_notify(Unit *u, UnitActiveState os, UnitActiveState ns, bool reload_su retroactively_stop_dependencies(u); } + /* stop unneeded units regardless if going down was expected or not */ + if (UNIT_IS_ACTIVE_OR_ACTIVATING(os) && UNIT_IS_INACTIVE_OR_DEACTIVATING(ns)) + check_unneeded_dependencies(u); + if (ns != os && ns == UNIT_FAILED) { log_notice("Unit %s entered failed state.", u->meta.id); unit_trigger_on_failure(u); |