core: make StopWhenUnneeded work in conjunction with units that fail
during their start job https://bugzilla.redhat.com/show_bug.cgi?id=997031
This commit is contained in:
parent
bcd02123e1
commit
b33918c210
|
@ -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
|
* sucessfully, since there's no change of state in that case. Which is
|
||||||
* why it is handled in service_set_state() */
|
* why it is handled in service_set_state() */
|
||||||
if (UNIT_IS_INACTIVE_OR_FAILED(os) != UNIT_IS_INACTIVE_OR_FAILED(ns)) {
|
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 (ec && exec_context_may_touch_console(ec)) {
|
||||||
if (UNIT_IS_INACTIVE_OR_FAILED(ns)) {
|
if (UNIT_IS_INACTIVE_OR_FAILED(ns)) {
|
||||||
m->n_on_console --;
|
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 */
|
/* 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);
|
check_unneeded_dependencies(u);
|
||||||
|
|
||||||
if (ns != os && ns == UNIT_FAILED) {
|
if (ns != os && ns == UNIT_FAILED) {
|
||||||
log_notice_unit(u->id,
|
log_notice_unit(u->id, "Unit %s entered failed state.", u->id);
|
||||||
"Unit %s entered failed state.", u->id);
|
|
||||||
unit_start_on_failure(u);
|
unit_start_on_failure(u);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue