core: include environment generator runtime in generator timestamps

Currently they aren't covered and it probably isn't worth adding another
kind of timestamp just for this, hence simply include it in the regular
generator timestamps.

diff --git a/src/core/manager.c b/src/core/manager.c
index 653fce8368a081973940678ea089516b126f1777..2dea89dc01f6b28c273d410a9ec77a581ade69a0 100644 (file)
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -1626,12 +1626,10 @@ int manager_startup(Manager *m, FILE *serialization, FDSet *fds) {
         if (r < 0)
                 return log_error_errno(r, "Failed to initialize path lookup table: %m");
 
-        r = manager_run_environment_generators(m);
-        if (r < 0)
-                return r;
-
         dual_timestamp_get(m->timestamps + manager_timestamp_initrd_mangle(MANAGER_TIMESTAMP_GENERATORS_START));
-        r = manager_run_generators(m);
+        r = manager_run_environment_generators(m);
+        if (r >= 0)
+                r = manager_run_generators(m);
         dual_timestamp_get(m->timestamps + manager_timestamp_initrd_mangle(MANAGER_TIMESTAMP_GENERATORS_FINISH));
         if (r < 0)
                 return r;