summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2014-02-13 02:12:27 +0100
committerLennart Poettering <lennart@poettering.net>2014-02-13 02:13:14 +0100
commitb33918c210a9b7a651e4e91cf7429967f1df6c25 (patch)
tree51c8ee2e067524732ace0eacb6360f44b1adfa84
parentbcd02123e10a23d79b0317072ed8d4a250163475 (diff)
core: make StopWhenUnneeded work in conjunction with units that fail
during their start job https://bugzilla.redhat.com/show_bug.cgi?id=997031
-rw-r--r--src/core/unit.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/core/unit.c b/src/core/unit.c
index 1a8fdcba34..0277675f60 100644
--- a/src/core/unit.c
+++ b/src/core/unit.c
@@ -1534,7 +1534,9 @@ void unit_notify(Unit *u, UnitActiveState os, UnitActiveState ns, bool reload_su
* sucessfully, since there's no change of state in that case. Which is
* why it is handled in service_set_state() */
if (UNIT_IS_INACTIVE_OR_FAILED(os) != UNIT_IS_INACTIVE_OR_FAILED(ns)) {
- ExecContext *ec = unit_get_exec_context(u);
+ ExecContext *ec;
+
+ ec = unit_get_exec_context(u);
if (ec && exec_context_may_touch_console(ec)) {
if (UNIT_IS_INACTIVE_OR_FAILED(ns)) {
m->n_on_console --;
@@ -1630,12 +1632,11 @@ void unit_notify(Unit *u, UnitActiveState os, UnitActiveState ns, bool reload_su
}
/* stop unneeded units regardless if going down was expected or not */
- if (UNIT_IS_ACTIVE_OR_ACTIVATING(os) && UNIT_IS_INACTIVE_OR_DEACTIVATING(ns))
+ if (UNIT_IS_INACTIVE_OR_DEACTIVATING(ns))
check_unneeded_dependencies(u);
if (ns != os && ns == UNIT_FAILED) {
- log_notice_unit(u->id,
- "Unit %s entered failed state.", u->id);
+ log_notice_unit(u->id, "Unit %s entered failed state.", u->id);
unit_start_on_failure(u);
}
}