chiark / gitweb /
unit: don't retroactively start units if we failed to shutdown a unit
authorLennart Poettering <lennart@poettering.net>
Thu, 2 Sep 2010 23:45:35 +0000 (01:45 +0200)
committerLennart Poettering <lennart@poettering.net>
Thu, 2 Sep 2010 23:45:53 +0000 (01:45 +0200)
src/unit.c

index d5ed5e1..001d765 100644 (file)
@@ -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) {
          * 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);
                         retroactively_start_dependencies(u);
                 else if (UNIT_IS_ACTIVE_OR_ACTIVATING(os) && UNIT_IS_INACTIVE_OR_DEACTIVATING(ns))
                         retroactively_stop_dependencies(u);