From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 2 Sep 2010 23:45:35 +0000 (+0200)
Subject: unit: don't retroactively start units if we failed to shutdown a unit
X-Git-Tag: v9~6
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=5ed9f5d65e7a7636936f9265093ba44b48e562c9;ds=sidebyside

unit: don't retroactively start units if we failed to shutdown a unit
---

diff --git a/src/unit.c b/src/unit.c
index d5ed5e142..001d7659c 100644
--- a/src/unit.c
+++ b/src/unit.c
@@ -1084,7 +1084,7 @@ void unit_notify(Unit *u, UnitActiveState os, UnitActiveState ns) {
          * something is already activated. */
 
         if (unexpected && u->meta.manager->n_deserializing <= 0) {
-                if (UNIT_IS_INACTIVE_OR_DEACTIVATING(os) && UNIT_IS_ACTIVE_OR_ACTIVATING(ns))
+                if (UNIT_IS_INACTIVE_OR_FAILED(os) && UNIT_IS_ACTIVE_OR_ACTIVATING(ns))
                         retroactively_start_dependencies(u);
                 else if (UNIT_IS_ACTIVE_OR_ACTIVATING(os) && UNIT_IS_INACTIVE_OR_DEACTIVATING(ns))
                         retroactively_stop_dependencies(u);