chiark / gitweb /
unit: don't complain about failed units when deserializing
authorLennart Poettering <lennart@poettering.net>
Tue, 29 Mar 2011 21:32:10 +0000 (23:32 +0200)
committerLennart Poettering <lennart@poettering.net>
Tue, 29 Mar 2011 21:32:10 +0000 (23:32 +0200)
src/unit.c

index 68eba69c6adf5061b11260fd391209816617b126..40aae75274ffe3d49b59925682c7bd767b63a5dd 100644 (file)
@@ -1211,7 +1211,7 @@ void unit_notify(Unit *u, UnitActiveState os, UnitActiveState ns, bool reload_su
                         retroactively_stop_dependencies(u);
         }
 
                         retroactively_stop_dependencies(u);
         }
 
-        if (ns != os && ns == UNIT_FAILED) {
+        if (ns != os && ns == UNIT_FAILED && u->meta.manager->n_deserializing <= 0) {
                 log_notice("Unit %s entered failed state.", u->meta.id);
                 unit_trigger_on_failure(u);
         }
                 log_notice("Unit %s entered failed state.", u->meta.id);
                 unit_trigger_on_failure(u);
         }